From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 29 Jul 2010 10:06:36 +0000 (+0200)
Subject: Update initscripts because of udev update.
X-Git-Tag: v2.9-beta1~48^2~5^2~2^2~144
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=bf015c4fda1e9cb073f3c94f4373d7cf51b374a6

Update initscripts because of udev update.
---

diff --git a/config/install/rc b/config/install/rc
index dd1fc1d4a4..ba1da5e5cd 100644
--- a/config/install/rc
+++ b/config/install/rc
@@ -38,13 +38,13 @@ modprobe libata
 
 echo "Starting udev daemon"
 /sbin/udevd --daemon
-/sbin/udevtrigger
-/sbin/udevsettle
+/sbin/udevadm trigger
+/sbin/udevadm settle
 
 sleep 3
 for file in /dev/.udev/failed/*/uevent ; do
 	echo "add" >"${file}"
 done 2>/dev/null
-/sbin/udevsettle
+/sbin/udevadm settle
 
 echo "Loading Installer..."
diff --git a/src/initscripts/init.d/udev b/src/initscripts/init.d/udev
index 0cb97cd0a6..03846e6f3a 100644
--- a/src/initscripts/init.d/udev
+++ b/src/initscripts/init.d/udev
@@ -60,10 +60,10 @@ case "${1}" in
 
 		# Now traverse /sys in order to "coldplug" devices that have
 		# already been discovered
-		/sbin/udevtrigger
+		/sbin/udevadm trigger
 
 		# Now wait for udevd to process the uevents we triggered
-		/sbin/udevsettle
+		/sbin/udevadm settle
 		evaluate_retval
 
 		;;
diff --git a/src/initscripts/init.d/udev_retry b/src/initscripts/init.d/udev_retry
index 82f05808f6..78461ce77e 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/udevsettle
+		/sbin/udevadm settle
 		evaluate_retval
 		;;