X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=scripts%2Frc.sysinit;h=0751a6ee1a51411f871c570abecc94b345280a8f;hb=ce14b9c2e09ed189803917f11eb2a902285f46f1;hp=52ddc707001078181e17fef10b6cb8ee9926d971;hpb=9ea1bff7b049ce152767460c68bb61f6aa500cef;p=startuptools

diff --git a/scripts/rc.sysinit b/scripts/rc.sysinit
index 52ddc70..0751a6e 100644
--- a/scripts/rc.sysinit
+++ b/scripts/rc.sysinit
@@ -20,14 +20,14 @@
 # need to mount sys because fsck might use it
 # try to mount them directly if they fail from fstab?
 # TODO bail to emergency shell if these fail?
-# try to mount them directly if they fail from fstab?                                        
-# TODO bail to emergency shell if these fail?                                                
+# TODO set NOVIRTFS='/var/run' and the like to skip some of these?
+
 status_begin mounting virtual filesystems
 mountpoint -q /proc    || mount -t proc proc /proc -o nosuid,noexec,nodev
 mountpoint -q /sys     || mount -t sysfs sys /sys -o nosuid,noexec,nodev
 mountpoint -q /var/run     || mount -t tmpfs run /var/run -o mode=0755,nosuid,nodev
 mountpoint -q /dev     || mount -t devtmpfs dev /dev -o mode=0755,nosuid
-mkdir -p /dev/{pts,shm}                                                                      
+mkdir /dev/pts /dev/shm
 mountpoint -q /dev/pts || mount -t devpts devpts /dev/pts -o mode=0620,gid=5,nosuid,noexec
 mountpoint -q /dev/shm || mount -t tmpfs shm /dev/shm -o mode=1777,nosuid,nodev
 # and make sure they all passed
@@ -61,47 +61,51 @@ status_begin loading sysctl.conf
 sysctl -q -p
 status_check
 
-# * set up /dev (via udev on modern linux systems)
-
-##
-## begin voodoo scripting from lfs-initscripts
-##
-
-# udev will handle hotplugs
-echo > /proc/sys/kernel/hotplug
-
-# start udev
-# this should probably be moved to inittab or started via
-# something that could monitor it
-status_starting udevd daemon
-/lib/udev/udevd --daemon
-status_check
-
-# Now traverse /sys in order to "coldplug" devices that have
-# already been discovered
-# this is going to fail if sys isn't mounted
-status_begin populating udevadm triggers
-udevadm trigger --action=add    --type=subsystems &&
-udevadm trigger --action=add    --type=devices &&
-udevadm trigger --action=change --type=devices
-status_check
-
-# Now wait for udevd to process the uevents we triggered
-#      if ! is_true "$OMIT_UDEV_SETTLE"; then
-status_begin waiting for udevadm to settle
-udevadm settle
-status_check
-#      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
-##
+# * set up /dev
+
+if [ -x /sbin/mdev ] && [ ! is_true "$USE_UDEVD" ]; then
+	echo /sbin/mdev > /proc/sys/kernel/hotplug
+elif [ -x /sbin/udevd ]; then
+	##
+	## begin voodoo scripting from lfs-initscripts
+	##
+
+
+	# udev will handle hotplugs
+	echo > /proc/sys/kernel/hotplug
+
+	# start udev
+	# this should probably be moved to inittab or started via
+	# something that could monitor it
+	status_starting udevd daemon
+	/sbin/udevd --daemon
+	status_check
+
+	# Now traverse /sys in order to "coldplug" devices that have
+	# already been discovered
+	# this is going to fail if sys isn't mounted
+	status_begin populating udevadm triggers
+	udevadm trigger --action=add    --type=subsystems &&
+	udevadm trigger --action=add    --type=devices &&
+	udevadm trigger --action=change --type=devices
+	status_check
+
+	# Now wait for udevd to process the uevents we triggered
+	#      if ! is_true "$OMIT_UDEV_SETTLE"; then
+
+	# quoted here so 'for' doesn't confuse syntax highlighting
+	status_begin 'waiting for udevadm to settle'
+	udevadm settle
+	status_check
+	# 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 
+	##
+	## end voodoo scripting
+	##
+fi
 
 # * set up swap
 
@@ -109,10 +113,11 @@ swapon -a
 
 # * fsck and mount filesystems
 
-status_starting fsck of /
-mount -o remount,ro /
-fsck -AT
+#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
 
@@ -123,6 +128,7 @@ status_check
 
 rm -f /etc/mtab
 mount -af
+mount -f /
 
 # * do any boot time /tmp cleanup or similar