diff options
| author | Richard W.M. Jones <rjones@redhat.com> | 2011-06-08 13:12:01 +0100 |
|---|---|---|
| committer | Richard W.M. Jones <rjones@redhat.com> | 2011-06-13 14:21:39 +0100 |
| commit | 8dfa48f696a29dbf30b403a98b240356149cfc5d (patch) | |
| tree | 6bb07e949c173938931635b99d4449119db27149 | |
| parent | 14c835add8420a4fbb45a753b380a34b974df0fa (diff) | |
| download | libguestfs-8dfa48f696a29dbf30b403a98b240356149cfc5d.tar.gz libguestfs-8dfa48f696a29dbf30b403a98b240356149cfc5d.tar.xz libguestfs-8dfa48f696a29dbf30b403a98b240356149cfc5d.zip | |
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)
| -rwxr-xr-x | appliance/init | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/appliance/init b/appliance/init index 1d31cd83..8bc422d9 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 |