better handling of mdev and udev

diff --git a/scripts/rc.shutdown b/scripts/rc.shutdown
index 18915e1c0811ffbbe257fc0d186a1532412a20ef..533fce9114ac4848ed35d3a007e908fbc44b5916 100644 (file)
--- a/scripts/rc.shutdown
+++ b/scripts/rc.shutdown
@@ -61,7 +61,7 @@ if is_true "$USELVM" && [ -x /sbin/vgchange ]; then
        status_check
 fi
 
        status_check
 fi
 

-if [ -x /sbin/udevadm ]; then
+if [ -x /sbin/udevadm && is_true "$USE_UDEV" ]; then

        status_begin "Shutting down udev"
        /sbin/udevadm control --exit
        status_check
        status_begin "Shutting down udev"
        /sbin/udevadm control --exit
        status_check

diff --git a/scripts/rc.sysinit b/scripts/rc.sysinit
index 40c33b0256240163cd7059eef518c44843b248df..1ecc8522de54a23dfd51a0a796c14b2fd09fa6d0 100644 (file)
--- a/scripts/rc.sysinit
+++ b/scripts/rc.sysinit
@@ -61,10 +61,19 @@ status_begin loading sysctl.conf
 sysctl -q -p
 status_check
 
 sysctl -q -p
 status_check
 

+# * fsck and mount filesystems
+
+#status_starting fsck of /
+#mount -o remount,ro /
+#fsck -A -T
+# TODO actually check the return value
+status_begin remounting root filesystem rw
+mount -o remount,rw /
+status_check

 
 # set up /dev
 
 
 # set up /dev
 

-if [ -x /sbin/mdev ] && [ ! is_true "$USE_UDEVD" ]; then
+if [ -x /sbin/mdev ] && ! is_true "$USE_UDEV" ; then

        status_starting setting up mdev
        echo > /dev/mdev.seq
        echo /sbin/mdev > /proc/sys/kernel/hotplug
        status_starting setting up mdev
        echo > /dev/mdev.seq
        echo /sbin/mdev > /proc/sys/kernel/hotplug


@@ -115,15 +124,6 @@ fi
 
 swapon -a
 
 
 swapon -a
 

-# * fsck and mount filesystems
-
-#status_starting fsck of /
-#mount -o remount,ro /
-#fsck -A -T
-# TODO actually check the return value
-status_begin remounting root filesystem rw
-mount -o remount,rw /
-status_check

 
 # mount any remaining filesystems
 status_begin mounting remaining filesystems
 
 # mount any remaining filesystems
 status_begin mounting remaining filesystems