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

["William Hubbs" <williamh@gentoo.org>]

commit:     11dda8627ed625c56cc93e920d4d31fa9204b9fb
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 15 20:20:35 2011 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Sun Jul 31 20:39:49 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/udev-gentoo-scripts.git;a=commit;h=11dda862

make our population calls match upstreams recommendations

---
 init.d/udev |   15 +++++----------
 1 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/init.d/udev b/init.d/udev
index eef2776..671ad86 100644
--- a/init.d/udev
+++ b/init.d/udev
@@ -114,23 +114,18 @@ populate_dev()
 	fi
 
 	ebegin "Populating /dev with existing devices through uevents"
-	if yesno "${rc_coldplug}"; then
-		udevadm trigger --action="add"
-	else
+	if ! yesno "${rc_coldplug}"; then
 		# Do not run any init-scripts, Bug #206518
 		udevadm control --property=do_not_run_plug_service=1
-
-		# only create device nodes
-		udevadm trigger --action="add" --attr-match=dev
-
-		# run persistent-net stuff, bug 191466
-		udevadm trigger --action="add" --subsystem-match=net
 	fi
+	udevadm trigger --type=subsystems
+	udevadm trigger --type=devices
 	eend $?
 
 	# we can speed up booting under these conditions:
 	#  * using devtmpfs so kernel creates device nodes for us
-	#  * only using kernel created device nodes at boot (in /etc/fstab and elsewhere)
+	#  * only using kernel created device nodes at boot
+	# (in /etc/fstab and elsewhere)
 	#
 	ebegin "Waiting for uevents to be processed"
 	udevadm settle --timeout=${udev_settle_timeout}