summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Gianelloni <wolf31o2@gentoo.org>2007-09-04 21:26:15 +0000
committerChris Gianelloni <wolf31o2@gentoo.org>2007-09-04 21:26:15 +0000
commit542e0ad65b5fff32b3c39b40eaceace966edebc4 (patch)
treec989d66446b506cfb410a7bafc4af05c95bee862
parentWe should be using /etc/init.d/functions.sh rather than /sbin/functions.sh so... (diff)
downloadlivecd-tools-542e0ad65b5fff32b3c39b40eaceace966edebc4.tar.gz
livecd-tools-542e0ad65b5fff32b3c39b40eaceace966edebc4.tar.bz2
livecd-tools-542e0ad65b5fff32b3c39b40eaceace966edebc4.zip
Move coldplugging/hotplugging/firmware unpacking before any other hardware detection. This should fix the problems with firmware not being available prior to the modules being loaded. This is for bug #191087.
git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/livecd-tools/trunk@130 7bf51bff-881f-0410-a643-fba68b97345e
-rwxr-xr-xautoconfig45
1 files changed, 23 insertions, 22 deletions
diff --git a/autoconfig b/autoconfig
index 3a2e4e8..1c658ca 100755
--- a/autoconfig
+++ b/autoconfig
@@ -223,6 +223,29 @@ detect_sparc() {
start() {
echo "0" > /proc/sys/kernel/printk
get_config
+
+ # First off, we want hotplug/coldplug enabled, so let's re-enable it.
+ # We do this even if we aren't startup up the hotplug/coldplug
+ # services for the installer.
+ sed -i 's/RC_COLDPLUG="no"/RC_COLDPLUG="yes"/' /etc/conf.d/rc
+ # Now, we check if we're supposed to run a coldplug script.
+ if [ "${HOTPLUG}" = "yes" ]
+ then
+ # Check whether we should be using hotplug or coldplug
+ if [ -x /etc/init.d/coldplug ]
+ then
+ start_service coldplug
+ elif [ -x /etc/init.d/hotplug ]
+ then
+ start_service hotplug
+ else
+ unpack_firmware
+ [ -x /sbin/udevtrigger ] && /sbin/udevtrigger
+ fi
+ else
+ ewarn "Hotplug/Coldplug disabled via cmdline ..."
+ fi
+
if [ "${DETECT}" = "yes" ]
then
ebegin "Hardware detection started"
@@ -349,28 +372,6 @@ start() {
fi
fi
- # First off, we want hotplug/coldplug enabled, so let's re-enable it. We do
- # this even if we aren't startup up the hotplug/coldplug services for the
- # installer.
- sed -i 's/RC_COLDPLUG="no"/RC_COLDPLUG="yes"/' /etc/conf.d/rc
- # Now, we check if we're supposed to run a coldplug script.
- if [ "${HOTPLUG}" = "yes" ]
- then
- # Check whether we should be using hotplug or coldplug
- if [ -x /etc/init.d/coldplug ]
- then
- start_service coldplug
- elif [ -x /etc/init.d/hotplug ]
- then
- start_service hotplug
- else
- unpack_firmware
- [ -x /sbin/udevtrigger ] && /sbin/udevtrigger
- fi
- else
- ewarn "Hotplug/Coldplug disabled via cmdline ..."
- fi
-
[ "${DETECT}" = "no" ] && DHCP="no"
[ "${DETECT}" = "yes" ] \
&& NETDEVICES="$(awk -F: '/eth.:|tr.:|ath.:|wlan.:/{print $1}' /proc/net/dev 2>/dev/null)"