diff options
| author | Tom Gundersen <teg@jklm.no> | 2012-01-18 23:16:06 +0100 |
|---|---|---|
| committer | Tom Gundersen <teg@jklm.no> | 2012-01-18 23:16:06 +0100 |
| commit | a1aee1e3606f76965db4c4a6ed44d04686d64826 (patch) | |
| tree | 51499987a1e6b7fe64042135c0be13d0b02c7f69 | |
| parent | 97f0cd6751e8d22c14d7492cdc2186cf41157ba6 (diff) | |
| download | initscripts-a1aee1e3606f76965db4c4a6ed44d04686d64826.tar.xz | |
udev: don't override settle timeout
The Arch default was 30 but upstream default was 120. This caused problems when
udev-177-3 introduced a 30 second timeout for broken kernel drivers.
We don't want to do this kind of fiddling in initscripts, if there is a need for
overriding the timeout this should be added upstream to udev.conf. My feeling is
that this is a bad idea, as there are now at least three different kinds of timeouts
at play in udev, and if they are set to something incompatible it will cause unneccesary
problems.
Signed-off-by: Tom Gundersen <teg@jklm.no>
| -rw-r--r-- | functions | 2 | ||||
| -rw-r--r-- | rc.conf | 1 | ||||
| -rw-r--r-- | rc.conf.5.txt | 6 |
3 files changed, 1 insertions, 8 deletions
@@ -357,7 +357,7 @@ udevd_modprobe() { status "Loading User-specified Modules" modprobe -ab "${MODULES[@]}" status "Waiting for UDev uevents to be processed" \ - udevadm settle --timeout=${UDEV_TIMEOUT:-30} + udevadm settle run_hook "$1_udevsettled" @@ -18,7 +18,6 @@ USECOLOR="yes" # HARDWARE # -------- MODULES=() -UDEV_TIMEOUT=30 USEDMRAID="no" USEBTRFS="no" USELVM="no" diff --git a/rc.conf.5.txt b/rc.conf.5.txt index 9ec8526..0be98a5 100644 --- a/rc.conf.5.txt +++ b/rc.conf.5.txt @@ -106,12 +106,6 @@ Modules to load at boot-up. To blacklist modules, see "man modprobe.conf". Default: (). -*UDEV_TIMEOUT=* - -Udev settle timeout. - -Default: 30 - *USEDMRAID=* Scan for FakeRAID (dmraid) Volumes at startup. |