summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2011-02-11 00:06:00 +0000
committerRobin H. Johnson <robbat2@gentoo.org>2011-02-11 00:06:00 +0000
commitf22d5015e9d6a89c0e5d786a4ac58ce65e83c530 (patch)
tree6ff5aba0b1f2709026093d5c2736e39a3fb491dd
parentmigrate yes/no tests to use if yesno (diff)
downloadlivecd-tools-f22d5015e9d6a89c0e5d786a4ac58ce65e83c530.tar.gz
livecd-tools-f22d5015e9d6a89c0e5d786a4ac58ce65e83c530.tar.bz2
livecd-tools-f22d5015e9d6a89c0e5d786a4ac58ce65e83c530.zip
Coldplug and hotplug are in list_services.
-rwxr-xr-xautoconfig9
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