# HG changeset patch
# User Christophe Lincoln <pankso@slitaz.org>
# Date 1234830028 -3600
# Node ID 5d620cd96aeeff58bdbe71ee013b3cace6de64c9
# Parent  1dc47d7c92cca62cc659b0a0275ef4f470512a3e
Fix pci detection and remove black list stuff

diff -r 1dc47d7c92cc -r 5d620cd96aee etc/init.d/hwconf.sh
--- a/etc/init.d/hwconf.sh	Mon Feb 16 17:50:01 2009 +0000
+++ b/etc/init.d/hwconf.sh	Tue Feb 17 01:20:28 2009 +0100
@@ -16,17 +16,15 @@
 
 	. /etc/rcS.conf
 	
+	# We need module_name to match output of lsmod.
 	echo "Detecting PCI devices..."
 	MODULES_LIST=`lspci -k | grep "modules" | cut -d ":" -f 2 | sed s/-/_/g`
 	for mod in $MODULES_LIST
 	do
-		if ! `lsmod | grep -q "$mod"` && ! `echo  $BLACKLIST_MODULES | grep -q "$mod"`; then
-			modname=`echo "$mod" | sed s/_/-/g`
-			if [ -f "$(modprobe -l $modname)" ]; then
-				echo "Loading Kernel modules: $modname"
-				detect="$detect $modname"
-				/sbin/modprobe $modname
-			fi
+		if ! lsmod | grep -q "$mod" && [ -f "$(modprobe -l $mod)" ]; then
+			echo "Loading Kernel modules: $mod"
+			detect="$detect $mod"
+			/sbin/modprobe $modname
 		fi
 	done
 	# yenta_socket = laptop
@@ -39,7 +37,6 @@
 	fi
 	echo "$detect" > /var/lib/detected-modules
 	# Now add modules to rcS.conf
-	
 	load=`echo "$LOAD_MODULES $detect" | sed s/"  "/" "/g`
 	sed -i s/"LOAD_MODULES=\"$LOAD_MODULES\""/"LOAD_MODULES=\"$load\""/ \
 		/etc/rcS.conf
diff -r 1dc47d7c92cc -r 5d620cd96aee etc/rcS.conf
--- a/etc/rcS.conf	Mon Feb 16 17:50:01 2009 +0000
+++ b/etc/rcS.conf	Tue Feb 17 01:20:28 2009 +0100
@@ -24,9 +24,6 @@
 #
 LOAD_MODULES="vfat nls_utf8 ohci_hcd"
 
-# Kernel modules that we never want to load.
-BLACKLIST_MODULES=""
-
 # Initialization scripts to run at boot time. Boot order is important,
 # bootopts.sh (boot options) must start first, then you are free to choose.
 # Note that the local.sh script exists to let you quickly add some local startup