From: Harald Hoyer <harald@redhat.com>
Date: Fri, 8 Feb 2013 13:16:10 +0000 (+0100)
Subject: systemd/dracut-initqueue.sh: replace $UDEV_QUEUE_EMPTY
X-Git-Tag: 026~76
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=11174408e833cb53dd532666d61f028a94fc48d5;p=thirdparty%2Fdracut.git

systemd/dracut-initqueue.sh: replace $UDEV_QUEUE_EMPTY

for systemd-udevd the version of udevd is high enough
---

diff --git a/modules.d/98systemd/dracut-initqueue.sh b/modules.d/98systemd/dracut-initqueue.sh
index c82b6eb24..76160cb8b 100755
--- a/modules.d/98systemd/dracut-initqueue.sh
+++ b/modules.d/98systemd/dracut-initqueue.sh
@@ -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