X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=scripts%2Frc.sysinit;h=1ecc8522de54a23dfd51a0a796c14b2fd09fa6d0;hb=bda2fccd8c53c14d154db28729aaaf65f61b3f4f;hp=29679512ebd2f88352a811a2da92c014e33d956b;hpb=24739081c80609ad45ba78147e2b55cddf7c29a2;p=startuptools diff --git a/scripts/rc.sysinit b/scripts/rc.sysinit index 2967951..1ecc852 100644 --- a/scripts/rc.sysinit +++ b/scripts/rc.sysinit @@ -61,11 +61,25 @@ status_begin loading sysctl.conf sysctl -q -p status_check -# * set up /dev +# * fsck and mount filesystems -if [ -x /bin/mdev ] && [ ! is_true "$USE_UDEVD" ]; then - echo /bin/mdev > /proc/sys/kernel/hotplug -elif [ -x /lib/udev/udevd ]; then +#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_UDEV" ; then + status_starting setting up mdev + echo > /dev/mdev.seq + echo /sbin/mdev > /proc/sys/kernel/hotplug + /sbin/mdev -s + status_check +elif [ -x /sbin/udevd ]; then ## ## begin voodoo scripting from lfs-initscripts ## @@ -77,7 +91,7 @@ elif [ -x /lib/udev/udevd ]; then # this should probably be moved to inittab or started via # something that could monitor it status_starting udevd daemon - /lib/udev/udevd --daemon + /sbin/udevd --daemon status_check # Now traverse /sys in order to "coldplug" devices that have @@ -96,14 +110,11 @@ elif [ -x /lib/udev/udevd ]; then status_begin 'waiting for udevadm to settle' udevadm settle status_check - # fi + # fi # If any LVM based partitions are on the system, ensure they # are activated so they can be used. # if [ -x /sbin/vgchange ]; then /sbin/vgchange -a y >/dev/null; fi - - # log_success_msg2 - ## ## end voodoo scripting ## @@ -113,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