[or-cvs] r11389: Use unpack_firmware patch that was applied to Gentoo livecd- (incognito/trunk/root_overlay/var/patches)

[double@xxxxxxxx]

Author: double
Date: 2007-09-06 14:03:56 -0400 (Thu, 06 Sep 2007)
New Revision: 11389

Modified:
   incognito/trunk/root_overlay/var/patches/autoconfig.patch
Log:
Use unpack_firmware patch that was applied to Gentoo livecd-tools source instead of my own.


Modified: incognito/trunk/root_overlay/var/patches/autoconfig.patch
===================================================================
--- incognito/trunk/root_overlay/var/patches/autoconfig.patch	2007-09-06 17:42:05 UTC (rev 11388)
+++ incognito/trunk/root_overlay/var/patches/autoconfig.patch	2007-09-06 18:03:56 UTC (rev 11389)
@@ -1,10 +1,61 @@
---- etc/init.d/autoconfig.orig	2007-09-03 07:49:13.000000000 -0500
-+++ etc/init.d/autoconfig	2007-09-03 07:52:58.000000000 -0500
-@@ -264,6 +264,7 @@
- 				;;
- 			esac
- 			[ -n "${PC}" ] && einfo "${PC}"
+--- etc/init.d/autoconfig.orig	2007-09-03 12:26:08.142773163 +0200
++++ etc/init.d/autoconfig	2007-09-03 12:33:19.946898737 +0200
+@@ -223,6 +223,29 @@
+ 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 /usr/sbin/hwsetup ] && hwsetup -p >/dev/null
- 		eend
- 	else
++			[ -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 @@
+ 		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)"