[arch-projects] [PATCH 2/2] [initscripts] workaround: do not set property=STARTUP=1 when calling udevadm

[Gerardo Exequiel Pozzi]

Apply same logic like in rc.sysinit
(commit c3063d0400e7a55c9dbd6ff1b76887744e9b6224)

Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386 at yahoo.com.ar>
---
 rc.single |    7 ++-----
 1 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/rc.single b/rc.single
index 8c3358f..06bd83c 100755
--- a/rc.single
+++ b/rc.single
@@ -19,7 +19,6 @@ if [[ $PREVLEVEL != N ]]; then
 	# Trigger udev uevents
 	if /bin/pidof -o %PPID /sbin/udevd >/dev/null; then
 		stat_busy "Triggering UDev uevents"
-		/sbin/udevadm control --property=STARTUP=1
 		/sbin/udevadm trigger --action=add --type=subsystems
 		/sbin/udevadm trigger --action=add --type=devices
 		stat_done
@@ -27,10 +26,8 @@ if [[ $PREVLEVEL != N ]]; then
 
 	# Wait for udev uevents
 	if /bin/pidof -o %PPID /sbin/udevd >/dev/null; then
-		stat_busy "Waiting for UDev uevents to be processed"
-		/sbin/udevadm settle
-		/sbin/udevadm control --property=STARTUP=
-		stat_done
+		status "Waiting for UDev uevents to be processed" \
+			/sbin/udevadm settle --quiet --timeout=${UDEV_TIMEOUT:-30}
 	fi
 
 	run_hook single_udevsettled
-- 
1.7.5