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

[William Hubbs]

commit:     bdb566aef830bd7d9f6a346b45590c371c81d6cf
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 31 22:36:44 2012 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Tue Jul 31 22:36:44 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/udev-gentoo-scripts.git;a=commit;h=bdb566ae

always wait for uevents

I was advised by upstream that we always need to wait for uevents, so
make the wait mandatory.

---
 conf.d/udev |    4 ----
 init.d/udev |    9 +++------
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/conf.d/udev b/conf.d/udev
index 921d86b..667cc8b 100644
--- a/conf.d/udev
+++ b/conf.d/udev
@@ -13,10 +13,6 @@
 
 # Expert options:
 
-# Should we wait for all uevents to be processed at boot?
-# Most of the time, this should not need to be changed.
-#udev_settle_wait="NO"
-
 # Timeout in seconds to wait for processing of uevents at boot.
 # There should be no need to change this.
 #udev_settle_timeout="60"

diff --git a/init.d/udev b/init.d/udev
index 4985d5d..33b0335 100644
--- a/init.d/udev
+++ b/init.d/udev
@@ -10,7 +10,6 @@ rc_coldplug=${rc_coldplug:-${RC_COLDPLUG:-YES}}
 udev_debug="${udev_debug:-no}"
 udev_monitor="${udev_monitor:-no}"
 udev_monitor_keep_running="${udev_monitor_keep_running:-no}"
-udev_settle_wait="${udev_settle_wait:-NO}"
 udev_settle_timeout="${udev_settle_timeout:-60}"
 kv_min="${kv_min:-2.6.34}"
 
@@ -138,11 +137,9 @@ populate_dev()
 	udevadm trigger --type=subsystems --action=add
 	udevadm trigger --type=devices --action=add
 	eend $?
-	if yesno "${udev_settle_wait}"; then
-		ebegin "Waiting for uevents to be processed"
-		udevadm settle --timeout=${udev_settle_timeout}
-		eend $?
-	fi
+	ebegin "Waiting for uevents to be processed"
+	udevadm settle --timeout=${udev_settle_timeout}
+	eend $?
 	udevadm control --property=do_not_run_plug_service=
 	return 0
 }