Gentoo Archives: gentoo-commits

From: William Hubbs <williamh@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/livecd-tools:master commit in: /
Date: Sun, 01 May 2011 02:51:24
Message-Id: e06923f0f8cb5a96ce767f3dee0009a131471b6e.williamH@gentoo
1 commit: e06923f0f8cb5a96ce767f3dee0009a131471b6e
2 Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
3 AuthorDate: Fri Feb 11 00:06:00 2011 +0000
4 Commit: William Hubbs <williamh <AT> gentoo <DOT> org>
5 CommitDate: Sun May 1 02:46:13 2011 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/livecd-tools.git;a=commit;h=e06923f0
7
8 Coldplug and hotplug are in list_services.
9
10 ---
11 autoconfig | 9 +++------
12 1 files changed, 3 insertions(+), 6 deletions(-)
13
14 diff --git a/autoconfig b/autoconfig
15 index c05a3d1..a65968b 100755
16 --- a/autoconfig
17 +++ b/autoconfig
18 @@ -457,13 +457,10 @@ start() {
19 then
20 # Check whether we should be using hotplug/coldplug or whether we should
21 # just let udev do it all.
22 - if [ -x /etc/init.d/coldplug ]
23 + # coldplug+hotplug would already be up due to list_services
24 + if [ ! -x /etc/init.d/coldplug -a ! -x /etc/init.d/hotplug ]
25 then
26 - /etc/init.d/coldplug start
27 - elif [ -x /etc/init.d/hotplug ]
28 - then
29 - /etc/init.d/hotplug start
30 - else
31 + # TODO: This needs to go to a seperate script, so that hwsetup can depend on it.
32 unpack_firmware
33 [ -x /sbin/udevtrigger ] && /sbin/udevtrigger
34 fi