* Tue Jul 09 2002 Florian La Roche <Florian.LaRoche@redhat.de>

- allow an option for ups poweroff  #68123
- change grep for ONBOOT=  #63903
- allow building with a cross-compiler  #64362,#64255
- faster check in network-functions:check_default_route()

5 files changed, 17 insertions, 8 deletions

diff --git a/initscripts.spec b/initscripts.spec
index a221e589..ef9d8823 100644
--- a/initscripts.spec
+++ b/initscripts.spec
@@ -244,6 +244,12 @@ rm -rf $RPM_BUILD_ROOT
 %dir /etc/locale/*/LC_MESSAGES
 
 %changelog
+* Tue Jul 09 2002 Florian La Roche <Florian.LaRoche@redhat.de>
+- allow an option for ups poweroff  #68123
+- change grep for ONBOOT=  #63903
+- allow building with a cross-compiler  #64362,#64255
+- faster check in network-functions:check_default_route()
+
 * Fri Jul 05 2002 Florian La Roche <Florian.LaRoche@redhat.de>
 - rc.sysinit: do not load raid modules unless /etc/raidtab exists
 - many cleanups for more consistent shell programming and also
diff --git a/rc.d/init.d/halt b/rc.d/init.d/halt
index 38766534..a9732185 100755
--- a/rc.d/init.d/halt
+++ b/rc.d/init.d/halt
@@ -189,7 +189,7 @@ fi
 
 if [ "$command" = /sbin/halt -a -r /etc/ups/upsmon.conf -a -f /etc/killpower -a -f /etc/sysconfig/ups ] ; then
 	. /etc/sysconfig/ups
-	[ "$SERVER" = "yes" -a "$MODEL" != "NONE" -a -n "$MODEL" -a -n "$DEVICE" ] && $MODEL $OPTIONS -k $DEVICE
+	[ "$SERVER" = "yes" -a "$MODEL" != "NONE" -a -n "$MODEL" -a -n "$DEVICE" ] && $MODEL $OPTIONS_HALT -k $DEVICE
 fi
 
 if [ -x /sbin/halt.local ]; then
diff --git a/rc.d/init.d/network b/rc.d/init.d/network
index 0a293c66..364b5567 100755
--- a/rc.d/init.d/network
+++ b/rc.d/init.d/network
@@ -93,7 +93,7 @@ case "$1" in
 			cipeinterfaces="$cipeinterfaces $DEVICE"
 			continue
 		fi
-		if LANG=C egrep -L "^ONBOOT=\"?[Nn][Oo]\"?" ifcfg-$i > /dev/null ; then
+		if LANG=C egrep -L "^ONBOOT=['\"]?[Nn][Oo]['\"]?" ifcfg-$i > /dev/null ; then
 		        # this loads the module, to preserve ordering
 			is_available $i
 			continue
@@ -120,7 +120,7 @@ case "$1" in
 	
 	# Bring up CIPE VPN interfaces
 	for i in $cipeinterfaces ; do 
-            if ! LANG=C egrep -L "^ONBOOT=\"?[Nn][Oo]\"?" ifcfg-$i >/dev/null 2>&1 ; then
+            if ! LANG=C egrep -L "^ONBOOT=['\"]?[Nn][Oo]['\"]?" ifcfg-$i >/dev/null 2>&1 ; then
 		# If we're in confirmation mode, get user confirmation
 		[ -n "$CONFIRM" ]  && 
 		{ 
diff --git a/src/Makefile b/src/Makefile
index cd9c812b..a99a7ee2 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -46,17 +46,20 @@ install-test:
 	install -m 755 testdinit $(ROOT)/etc/init.d/testd
 
 ipcalc: ipcalc.o
-	$(CC) $(LDFLAGS) -o $@ $< /usr/lib/libpopt.a
+	$(CC) $(LDFLAGS) -o $@ $< -Wl,-Bstatic -lpopt -Wl,-Bdynamic
 
 initlog: $(INITLOG_OBJS)
-	$(CC) $(LDFLAGS) -o $@ $(INITLOG_OBJS) /usr/lib/libpopt.a
+	$(CC) $(LDFLAGS) -o $@ $(INITLOG_OBJS) -Wl,-Bstatic -lpopt -Wl,-Bdynamic
 
 usleep: $(USLEEP_OBJS)
-	$(CC) $(LDFLAGS) -o $@ $(USLEEP_OBJS) /usr/lib/libpopt.a
+	$(CC) $(LDFLAGS) -o $@ $(USLEEP_OBJS) -Wl,-Bstatic -lpopt -Wl,-Bdynamic
 
 ppp-watch: $(PPPWATCH_OBJS)
-	$(CC) $(LDFLAGS) -o $@ $(PPPWATCH_OBJS) /usr/lib/libglib.a
+	$(CC) $(LDFLAGS) -o $@ $(PPPWATCH_OBJS) -Wl,-Bstatic -lglib -Wl,-Bdynamic
+
 shvar.o: shvar.c
 	$(CC) $(CFLAGS) `glib-config --cflags` -c shvar.c -o shvar.o
+
 ppp-watch.o: ppp-watch.c
 	$(CC) $(CFLAGS) `glib-config --cflags` -c ppp-watch.c -o ppp-watch.o
+
diff --git a/sysconfig/network-scripts/network-functions b/sysconfig/network-scripts/network-functions
index 5d84102d..c54be9a3 100644
--- a/sysconfig/network-scripts/network-functions
+++ b/sysconfig/network-scripts/network-functions
@@ -153,7 +153,7 @@ check_link_down ()
 
 check_default_route ()
 {
-    LC_ALL=C ip route | grep -q default
+    LC_ALL=C ip route list match 0/0 | grep -q default
 }
 
 find_gateway_dev ()