From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Sat, 6 Sep 2008 19:09:44 +0000 (+0200)
Subject: Load libata prior udev at installer because some SATA doesnt autoload it
X-Git-Tag: v2.3-beta4~56^2~5
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=3d28f4f5a4e2f7bb2e375d4a8859f6eb1db3e56e

Load libata prior udev at installer because some SATA doesnt autoload it
Add countrycode for atheros wlan cards
---

diff --git a/config/install/rc b/config/install/rc
index 48d02bb4fc..dd1fc1d4a4 100644
--- a/config/install/rc
+++ b/config/install/rc
@@ -32,6 +32,10 @@ ln -s /proc/kcore /dev/core
 echo "Starting syslogd"
 syslogd -O /dev/tty4
 
+echo "Loading scsi_mod & libata module"
+modprobe scsi_mod
+modprobe libata
+
 echo "Starting udev daemon"
 /sbin/udevd --daemon
 /sbin/udevtrigger
diff --git a/config/rootfiles/common/madwifi b/config/rootfiles/common/madwifi
index d4bf0ea14a..692063aa27 100644
--- a/config/rootfiles/common/madwifi
+++ b/config/rootfiles/common/madwifi
@@ -1,4 +1,5 @@
 etc/madwifi.conf
+etc/modprobe.d/madwifi
 usr/bin/80211debug
 usr/bin/80211stats
 usr/bin/ath_info
diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index 546077dee1..cd6a008eec 100644
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -241,6 +241,7 @@
 * psmisc-22.2
 * qemu-0.9.1
 * r8168-8.005.00
+* r8169-6.005.00
 * readline-5.1
 * reiser4progs-1.0.5
 * reiserfsprogs-3.6.19
diff --git a/lfs/initrd b/lfs/initrd
index a98f375fea..b4d0e3bcfd 100644
--- a/lfs/initrd
+++ b/lfs/initrd
@@ -70,7 +70,7 @@ $(TARGET) :
 	cp /opt/$(MACHINE)-uClibc/lib/libgcc_s.so.1 /install/initrd/lib/
 
 	cd /install/initrd/lib/ && ln -sf libgcc_s.so.1 libgcc_s.so
-	
+
 	-mkdir -p /install/{images,mnt}
 	rm -rf /install/mnt/*
 
diff --git a/lfs/madwifi b/lfs/madwifi
index 509013e2cb..9f2f9c4db4 100644
--- a/lfs/madwifi
+++ b/lfs/madwifi
@@ -81,4 +81,7 @@ ifeq "$(SMP)" ""
 	cp $(DIR_SRC)/config/madwifi/madwifi.conf /etc/
 	ln -s $(DIR_APP) $(DIR_SRC)/madwifi 
 endif
+	# Set Countrycode to germany because some cards
+	# are not detected without cc
+	echo options ath_pci countrycode=276 > /etc/modprobe.d/madwifi
 	@$(POSTBUILD)
diff --git a/src/install+setup/install/main.c b/src/install+setup/install/main.c
index 5e12811b33..0fe97a1fdc 100644
--- a/src/install+setup/install/main.c
+++ b/src/install+setup/install/main.c
@@ -107,7 +107,6 @@ int main(int argc, char *argv[])
 	mysystem("/sbin/modprobe generic");
 	mysystem("/sbin/modprobe ide-cd");
 	mysystem("/sbin/modprobe ide-disk");
-	mysystem("/sbin/modprobe sata_via");
 	mysystem("/sbin/modprobe uhci-hcd");
 	mysystem("/sbin/modprobe ohci-hcd");
 	mysystem("/sbin/modprobe ehci-hcd");
diff --git a/src/install+setup/install/probehw.sh b/src/install+setup/install/probehw.sh
index 0872d25fef..c56462ee1d 100644
--- a/src/install+setup/install/probehw.sh
+++ b/src/install+setup/install/probehw.sh
@@ -55,7 +55,7 @@ for i in a b c d e f g; do
 	fi
 done
 
-for MODULE in $(ls /lib/modules/*/kernel/drivers/scsi); do
+for MODULE in $(ls /lib/modules/*/kernel/drivers/ata && ls /lib/modules/*/kernel/drivers/scsi); do
 	MODULE=`basename $MODULE | awk -F. '{ print $1 }'`
 	
 	echo -n "Probing for $MODULE"