- cleanups in sysinit + fix for shutting down bridge

[projects/rc-scripts.git] / rc.d / rc.sysinit

diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit
index ed1c0f8a077e81aebbf38070635951c83f53ced6..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.12 2001/10/13 08:29:19 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
 
@@ -274,13 +274,6 @@ fi
 # Remount the root filesystem read-write.
 run_cmd "Remounting root filesystem in rw mode" mount -n -o remount,rw /
 
-# Find and activate volume groups
-if [ -e /proc/lvm -a -x /sbin/vgscan -a -x /sbin/vgchange -a -e /etc/lvmtab ]; then
-       modprobe -s lvm-mod >/dev/null 2>&1
-       run_cmd "Scanning for LVM volume groups" /sbin/vgscan && \
-       run_cmd "Activating LVM volume groups" /sbin/vgchange -a y
-fi
-
 # Clear mtab
 >/etc/mtab
 
@@ -397,6 +390,13 @@ if [ -x /etc/rc.d/rc.modules ]; then
         /etc/rc.d/rc.modules
 fi
 
+# Find and activate volume groups
+modprobe -s lvm-mod >/dev/null 2>&1
+if [ -e /proc/lvm -a -x /sbin/vgscan -a -x /sbin/vgchange -a -e /etc/lvmtab ]; then
+       run_cmd "Scanning for LVM volume groups" /sbin/vgscan && \
+       run_cmd "Activating LVM volume groups" /sbin/vgchange -a y
+fi
+
 # Add raid devices
 if [ ! -f /proc/mdstat ]; then
         modprobe -s md >/dev/null 2>&1
@@ -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.