summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard W.M. Jones <rjones@redhat.com>2012-06-14 14:21:16 +0100
committerRichard W.M. Jones <rjones@redhat.com>2012-06-14 14:22:07 +0100
commitabbace68881b0917919913fe71bd738e45f36df5 (patch)
treee38be7dd1ccb8281525f6d523ed20f429879a72b
parentd43e3d63de1622e98313bb797922dfd7d95ddd11 (diff)
downloadlibguestfs-abbace68881b0917919913fe71bd738e45f36df5.tar.gz
libguestfs-abbace68881b0917919913fe71bd738e45f36df5.tar.xz
libguestfs-abbace68881b0917919913fe71bd738e45f36df5.zip
virtio-scsi: Increase udev timeout.
In Koji, when you've got 200+ disks, udev times out before all the udev events have been processed.
-rwxr-xr-xappliance/init2
-rw-r--r--src/launch.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/appliance/init b/appliance/init
index 6fac4fbc..bfc09528 100755
--- a/appliance/init
+++ b/appliance/init
@@ -40,7 +40,7 @@ else
echo -e '\000\000\000\000' > /proc/sys/kernel/hotplug
$UDEVD --daemon
udevadm trigger
- udevadm settle
+ udevadm settle --timeout=600
else
echo No udevd, creating /dev manually.
mount -t tmpfs none /dev
diff --git a/src/launch.c b/src/launch.c
index 6c8105e4..ca5cab25 100644
--- a/src/launch.c
+++ b/src/launch.c
@@ -831,7 +831,7 @@ launch_appliance (guestfs_h *g)
#define LINUX_CMDLINE \
"panic=1 " /* force kernel to panic if daemon exits */ \
"console=" SERIAL_CONSOLE " " /* serial console */ \
- "udevtimeout=300 " /* good for very slow systems (RHBZ#480319) */ \
+ "udevtimeout=600 " /* good for very slow systems (RHBZ#480319) */ \
"no_timer_check " /* fix for RHBZ#502058 */ \
"acpi=off " /* we don't need ACPI, turn it off */ \
"printk.time=1 " /* display timestamp before kernel messages */ \