summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Rini <tom_rini@mentor.com>2010-08-20 16:00:18 -0700
committerTom Rini <tom_rini@mentor.com>2010-08-20 16:00:18 -0700
commit4e20a53382e3c00fbc437371b640b4afce9b9701 (patch)
treed0fbb77a965165bec04cd56faf5bf1b94c2c39df
parent4bbc0df43bc27e51aa5f4410693389003aec9ae1 (diff)
udev 141/154: Move udevadm settle timeout to 8 to match 151
Signed-off-by: Tom Rini <tom_rini@mentor.com>
-rw-r--r--recipes/udev/udev-141/init2
-rw-r--r--recipes/udev/udev-154/init2
2 files changed, 2 insertions, 2 deletions
diff --git a/recipes/udev/udev-141/init b/recipes/udev/udev-141/init
index 9f7b2c4a7f..14f2d50c3d 100644
--- a/recipes/udev/udev-141/init
+++ b/recipes/udev/udev-141/init
@@ -59,7 +59,7 @@ kill_udevd > "/dev/null" 2>&1
/sbin/udevadm control --env STARTUP=1
if [ "$not_first_boot" != "" ];then
/sbin/udevadm trigger --subsystem-nomatch=tty --subsystem-nomatch=mem --subsystem-nomatch=vc --subsystem-nomatch=vtconsole --subsystem-nomatch=misc --subsystem-nomatch=dcon --subsystem-nomatch=pci_bus --subsystem-nomatch=graphics --subsystem-nomatch=backlight --subsystem-nomatch=video4linux --subsystem-nomatch=platform
- (/sbin/udevadm settle --timeout=3; /sbin/udevadm control --env STARTUP=)&
+ (/sbin/udevadm settle --timeout=8; /sbin/udevadm control --env STARTUP=)&
else
/sbin/udevadm trigger
/sbin/udevadm settle
diff --git a/recipes/udev/udev-154/init b/recipes/udev/udev-154/init
index e9ecf970b3..4dcb241a28 100644
--- a/recipes/udev/udev-154/init
+++ b/recipes/udev/udev-154/init
@@ -64,7 +64,7 @@ kill_udevd > "/dev/null" 2>&1
/sbin/udevadm control --env STARTUP=1
if [ "$not_first_boot" != "" ];then
/sbin/udevadm trigger --subsystem-nomatch=tty --subsystem-nomatch=mem --subsystem-nomatch=vc --subsystem-nomatch=vtconsole --subsystem-nomatch=misc --subsystem-nomatch=dcon --subsystem-nomatch=pci_bus --subsystem-nomatch=graphics --subsystem-nomatch=backlight --subsystem-nomatch=video4linux --subsystem-nomatch=platform
- (/sbin/udevadm settle --timeout=3; /sbin/udevadm control --env STARTUP=)&
+ (/sbin/udevadm settle --timeout=8; /sbin/udevadm control --env STARTUP=)&
else
/sbin/udevadm trigger
/sbin/udevadm settle