diff options
| author |   William Hubbs <williamh@gentoo.org> | 2013-02-25 22:16:00 -0600 |
|---|---|---|
| committer | William Hubbs <williamh@gentoo.org> | 2013-02-27 13:08:50 -0600 |
| commit | 5dd65894052cd6f4d9aebd67c93e61c3259e7303 (patch) | |
| tree | b2b41fd5bcb294107ef7828fce4b18cd122f7941 | |
| parent | init.d/udev: remove kernel version checks (diff) | |
| download | udev-gentoo-scripts-5dd65894052cd6f4d9aebd67c93e61c3259e7303.tar.gz udev-gentoo-scripts-5dd65894052cd6f4d9aebd67c93e61c3259e7303.tar.bz2 udev-gentoo-scripts-5dd65894052cd6f4d9aebd67c93e61c3259e7303.zip | |
udev: skip "udevadm trigger" calls if coldplug sequence is not requested
Reported-by: matthew4196@gmail.com
X-Gentoo-Bug: 424189
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=424189
| -rw-r--r-- | init.d/udev | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/init.d/udev b/init.d/udev index af0a40e..f2e1e48 100644 --- a/init.d/udev +++ b/init.d/udev @@ -100,23 +100,20 @@ start_udevmonitor() populate_dev() { - if get_bootparam "nocoldplug" ; then - rc_coldplug="NO" - ewarn "Skipping udev coldplug as requested in kernel cmdline" + get_bootparam "nocoldplug" && rc_coldplug="no" + if ! yesno $rc_coldplug; then + ewarn "Skipping udev coldplug sequence" + return 0 fi ebegin "Populating /dev with existing devices through uevents" - if ! yesno "${rc_coldplug}"; then - # Do not run any init-scripts, Bug #206518 - udevadm control --property=do_not_run_plug_service=1 - fi udevadm trigger --type=subsystems --action=add udevadm trigger --type=devices --action=add eend $? + ebegin "Waiting for uevents to be processed" udevadm settle --timeout=${udev_settle_timeout} eend $? - udevadm control --property=do_not_run_plug_service= return 0 } |