diff options
| author | Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar> | 2011-04-30 15:41:12 -0300 |
|---|---|---|
| committer | Tom Gundersen <teg@jklm.no> | 2011-04-30 21:20:43 +0200 |
| commit | a43cb3c03ca768956ceb9e2856683eae5c48c68f (patch) | |
| tree | 637ab15a1035bd18be6f43e7ff5e51a17a63b355 /rc.single | |
| parent | 05d4eaa92f004f066e47de0453384563f2c5f867 (diff) | |
| download | initscripts-a43cb3c03ca768956ceb9e2856683eae5c48c68f.tar.xz | |
workaround: do not set property=STARTUP=1 when calling udevadm
Apply same logic like in rc.sysinit
(commit c3063d0400e7a55c9dbd6ff1b76887744e9b6224)
Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
Signed-off-by: Tom Gundersen <teg@jklm.no>
Diffstat (limited to 'rc.single')
| -rwxr-xr-x | rc.single | 7 |
1 files changed, 2 insertions, 5 deletions
@@ -19,7 +19,6 @@ if [[ $PREVLEVEL != N ]]; then # Trigger udev uevents if /bin/pidof -o %PPID /sbin/udevd >/dev/null; then stat_busy "Triggering UDev uevents" - /sbin/udevadm control --property=STARTUP=1 /sbin/udevadm trigger --action=add --type=subsystems /sbin/udevadm trigger --action=add --type=devices stat_done @@ -27,10 +26,8 @@ if [[ $PREVLEVEL != N ]]; then # Wait for udev uevents if /bin/pidof -o %PPID /sbin/udevd >/dev/null; then - stat_busy "Waiting for UDev uevents to be processed" - /sbin/udevadm settle - /sbin/udevadm control --property=STARTUP= - stat_done + status "Waiting for UDev uevents to be processed" \ + /sbin/udevadm settle --quiet --timeout=${UDEV_TIMEOUT:-30} fi run_hook single_udevsettled |