initskripts: updates for new udev.
authorArne Fitzenreiter <arne_f@ipfire.org>
Mon, 18 Nov 2013 22:36:10 +0000 (23:36 +0100)
committerArne Fitzenreiter <arne_f@ipfire.org>
Mon, 18 Nov 2013 22:36:10 +0000 (23:36 +0100)
src/initscripts/init.d/udev
src/initscripts/init.d/udev_retry

index 03846e6f3a983664b54991b25d2ea4e99389f7fa..72d1e4067147425248241b08d0e37891368cca79 100644 (file)
@@ -17,6 +17,9 @@
 
 case "${1}" in
        start)
+               boot_mesg "Mount /var/run..."
+               mount -n -t tmpfs tmpfs /var/run -o size=2M
+
                boot_mesg "Populating /dev with device nodes..."
                if ! grep -q '[[:space:]]sysfs' /proc/mounts; then
                        echo_failure
@@ -29,16 +32,10 @@ case "${1}" in
                        read ENTER
                        /etc/rc.d/init.d/halt stop
                fi
-
-               # Mount a temporary file system over /dev, so that any devices
-               # made or removed during this boot don't affect the next one.
-               # The reason we don't write to mtab is because we don't ever
-               # want /dev to be unavailable (such as by `umount -a').
-               mount -n -t tmpfs tmpfs /dev -o mode=755
-               if [ ${?} != 0 ]; then
+               if ! grep -q '[[:space:]]/dev' /proc/mounts; then
                        echo_failure
-                       boot_mesg -n "FAILURE:\n\nCannot mount a tmpfs" ${FAILURE}
-                       boot_mesg -n " onto /dev, this system will be halted."
+                       boot_mesg -n "FAILURE:\n\nKernel has no devtmpfs/mount" ${FAILURE}
+                       boot_mesg -n " support but this is needed for udev."
                        boot_mesg -n "\n\nAfter you press Enter, this system"
                        boot_mesg -n " will be halted and powered off."
                        boot_mesg -n "\n\nPress Enter to continue..." ${INFO}
@@ -60,10 +57,10 @@ case "${1}" in
 
                # Now traverse /sys in order to "coldplug" devices that have
                # already been discovered
-               /sbin/udevadm trigger
+               /bin/udevadm trigger
 
                # Now wait for udevd to process the uevents we triggered
-               /sbin/udevadm settle
+               /bin/udevadm settle
                evaluate_retval
 
                ;;
index 78461ce77e293302f2f7f82e45023a1fe166b813..25e6967c813a32ed5fb44aba8d9f1add87f56e12 100644 (file)
@@ -26,7 +26,7 @@ case "${1}" in
                done 2>/dev/null
                
                # Now wait for udevd to process the uevents we triggered
-               /sbin/udevadm settle
+               /bin/udevadm settle
                evaluate_retval
                ;;