[gentoo-commits] proj/udev-gentoo-scripts:master commit in: init.d/

[William Hubbs]

commit:     5dd65894052cd6f4d9aebd67c93e61c3259e7303
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 26 04:16:00 2013 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Wed Feb 27 19:08:50 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/udev-gentoo-scripts.git;a=commit;h=5dd65894

udev: skip "udevadm trigger" calls if coldplug sequence is not requested

Reported-by: matthew4196 <AT> gmail.com
X-Gentoo-Bug: 424189
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=424189

---
 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
 }