[gentoo-commits] proj/livecd-tools:master commit in: /

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

commit:     e06923f0f8cb5a96ce767f3dee0009a131471b6e
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 11 00:06:00 2011 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Sun May  1 02:46:13 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/livecd-tools.git;a=commit;h=e06923f0

Coldplug and hotplug are in list_services.

---
 autoconfig |    9 +++------
 1 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/autoconfig b/autoconfig
index c05a3d1..a65968b 100755
--- a/autoconfig
+++ b/autoconfig
@@ -457,13 +457,10 @@ start() {
 	then
 		# Check whether we should be using hotplug/coldplug or whether we should
 		# just let udev do it all.
-		if [ -x /etc/init.d/coldplug ]
+		# coldplug+hotplug would already be up due to list_services
+		if [ ! -x /etc/init.d/coldplug -a ! -x /etc/init.d/hotplug ]
 		then
-			/etc/init.d/coldplug start
-		elif [ -x /etc/init.d/hotplug ]
-		then
-			/etc/init.d/hotplug start
-		else
+			# TODO: This needs to go to a seperate script, so that hwsetup can depend on it.
 			unpack_firmware
 			[ -x /sbin/udevtrigger ] && /sbin/udevtrigger
 		fi