From: Richard W.M. Jones <rjones@redhat.com>
Date: Wed, 8 Jun 2011 12:12:01 +0000 (+0100)
Subject: init: Remove timeout in udevadm settle command.
X-Git-Tag: 1.10.4~16
X-Git-Url: http://git.annexia.org/?a=commitdiff_plain;h=8dfa48f696a29dbf30b403a98b240356149cfc5d;p=libguestfs.git

init: Remove timeout in udevadm settle command.

The given timeout (10s) was too low if the appliance was
running slowly, which caused a cascade of other failures
during tests.

Note that in udev-171 and above on Fedora, /sbin/start_udev
no longer exists, so now we are using this manual method to
start udevd.
(cherry picked from commit bfc02f78f36d88543f8435e450e28c986b667a94)
---

diff --git a/appliance/init b/appliance/init
index 1d31cd8..8bc422d 100755
--- a/appliance/init
+++ b/appliance/init
@@ -28,7 +28,7 @@ elif [ -x /sbin/udevd ]; then
   echo -e '\000\000\000\000' > /proc/sys/kernel/hotplug
   /sbin/udevd --daemon
   /sbin/udevadm trigger
-  /sbin/udevadm settle --timeout=10
+  /sbin/udevadm settle
 else
   echo No udev, creating /dev manually
   mount -t tmpfs none /dev