From bda2fccd8c53c14d154db28729aaaf65f61b3f4f Mon Sep 17 00:00:00 2001 From: Nathan Wagner Date: Tue, 1 Apr 2014 22:54:20 +0000 Subject: [PATCH] better handling of mdev and udev --- scripts/rc.shutdown | 2 +- scripts/rc.sysinit | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/scripts/rc.shutdown b/scripts/rc.shutdown index 18915e1..533fce9 100644 --- a/scripts/rc.shutdown +++ b/scripts/rc.shutdown @@ -61,7 +61,7 @@ if is_true "$USELVM" && [ -x /sbin/vgchange ]; then 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 diff --git a/scripts/rc.sysinit b/scripts/rc.sysinit index 40c33b0..1ecc852 100644 --- a/scripts/rc.sysinit +++ b/scripts/rc.sysinit @@ -61,10 +61,19 @@ status_begin loading sysctl.conf 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 -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 @@ -115,15 +124,6 @@ fi 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 -- 2.40.0