- cleanups in sysinit + fix for shutting down bridge

svn-id: @964

diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit
index 4001ba1a2a1e09c480e00b64283c2570e47294d4..a81c4e4a75f88b362f621783ca1085c5f9af265e 100755 (executable)
--- a/rc.d/rc.sysinit
+++ b/rc.d/rc.sysinit
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # /etc/rc.d/rc.sysinit - run once at boot time
-# $Id: rc.sysinit,v 1.69.2.13 2001/10/22 08:51:13 misiek Exp $
+# $Id: rc.sysinit,v 1.69.2.14 2001/10/25 08:27:05 misiek Exp $
 #
 # Taken in part from Miquel van Smoorenburg's bcheckrc.
 # Changes:      Arkadiusz Mi¶kiewicz <misiek@pld.org.pl>
@@ -80,6 +80,9 @@ if is_yes "$PROMPT"; then
        sleep 1
 fi
 
+# Set console loglevel
+/bin/dmesg -n $CONSOLE_LOGLEVEL
+
 # /dev must be also mounted before everything but only if we want use them ;-)
 if is_yes "$MOUNT_DEVFS"; then
     run_cmd "Mounting Device Filesystem" mount -n -t devfs /dev /dev
@@ -90,9 +93,6 @@ if [ -e /dev/.devfsd -a -x /sbin/devfsd ]; then
        run_cmd "Starting Device Filesystem Daemon" /sbin/devfsd /dev
 fi
 
-# Set console loglevel
-/bin/dmesg -n $CONSOLE_LOGLEVEL
-
 # Configure Linux kernel
 run_cmd "Configuring kernel parameters" /sbin/sysctl -p /etc/sysctl.conf
 
@@ -544,7 +544,7 @@ fi
 
 if [ -f /proc/sys/kernel/panic -a "$PANIC_REBOOT_TIME" -gt "0" ]; then
        show 'Setting %s seconds for kernel reboot after panic' "$PANIC_REBOOT_TIME"; busy
-       if (sysctl -w kernel.panic=$PANIC_REBOOT_TIME 2> /dev/null); then ok; else fail; fi
+       if (sysctl -w kernel.panic=$PANIC_REBOOT_TIME > /dev/null 2>&1); then ok; else fail; fi
 fi
 
 # Clean out /etc.

diff --git a/sysconfig/network-scripts/ifdown-br b/sysconfig/network-scripts/ifdown-br
index abb0eacb8efc57e7e0cb73252dd9399860fbd046..3d9c0be1e4afd799c8a2060136dc7f1fe4a785cf 100755 (executable)
--- a/sysconfig/network-scripts/ifdown-br
+++ b/sysconfig/network-scripts/ifdown-br
@@ -17,7 +17,7 @@
 #    along with this program; if not, write to the Free Software
 #    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
-#    $Id: ifdown-br,v 1.1.2.2 2001/09/30 10:19:42 misiek Exp $
+#    $Id: ifdown-br,v 1.1.2.3 2001/10/25 08:27:06 misiek Exp $
 #
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
 
@@ -44,12 +44,13 @@ fi
 setup_ip_param
 
 # set device down and forget all addresses
-for device in ${BRIDGE_DEVS} ${DEVICE}; do
+for device in ${BRIDGE_DEVS; do
        ip link set ${device} down
        ip addr flush dev ${device} 2>&1 | grep -v "Nothing to flush"
        brctl delif ${DEVICE} ${device}
 done
 
+ip link set ${DEVICE} down
 brctl delbr ${DEVICE}
 
 # This must be last line !