systemd/dracut-initqueue.sh: replace $UDEV_QUEUE_EMPTY
authorHarald Hoyer <harald@redhat.com>
Fri, 8 Feb 2013 13:16:10 +0000 (14:16 +0100)
committerHarald Hoyer <harald@redhat.com>
Mon, 11 Feb 2013 10:49:19 +0000 (11:49 +0100)
for systemd-udevd the version of udevd is high enough

modules.d/98systemd/dracut-initqueue.sh

index c82b6eb..76160cb 100755 (executable)
@@ -39,7 +39,7 @@ while :; do
         check_finished && break 2
     done
 
-    $UDEV_QUEUE_EMPTY >/dev/null 2>&1 || continue
+    udevadm settle --timeout=0 >/dev/null 2>&1 || continue
 
     for job in $hookdir/initqueue/settled/*.sh; do
         [ -e "$job" ] || break
@@ -47,12 +47,11 @@ while :; do
         check_finished && break 2
     done
 
-    $UDEV_QUEUE_EMPTY >/dev/null 2>&1 || continue
+    udevadm settle --timeout=0 >/dev/null 2>&1 || continue
 
     # no more udev jobs and queues empty.
     sleep 0.5
 
-
     if [ $main_loop -gt $((2*$RDRETRY/3)) ]; then
         for job in $hookdir/initqueue/timeout/*.sh; do
             [ -e "$job" ] || break