From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Mon, 18 Nov 2013 22:36:10 +0000 (+0100)
Subject: initskripts: updates for new udev.
X-Git-Tag: v2.15-beta1~143
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=80469a89354a686b5fc56066828ed763f81e55a4;p=people%2Fpmueller%2Fipfire-2.x.git

initskripts: updates for new udev.
---

diff --git a/src/initscripts/init.d/udev b/src/initscripts/init.d/udev
index 03846e6f3a..72d1e40671 100644
--- a/src/initscripts/init.d/udev
+++ b/src/initscripts/init.d/udev
@@ -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
 
 		;;
diff --git a/src/initscripts/init.d/udev_retry b/src/initscripts/init.d/udev_retry
index 78461ce77e..25e6967c81 100644
--- a/src/initscripts/init.d/udev_retry
+++ b/src/initscripts/init.d/udev_retry
@@ -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
 		;;