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 48d02bb4fc0d6ab1e0c27738957f69bd837c7dc9..dd1fc1d4a4be7311769d7f7cf2999d44839b35f8 100644 (file)
--- 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 "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
 echo "Starting udev daemon"
 /sbin/udevd --daemon
 /sbin/udevtrigger

diff --git a/config/rootfiles/common/madwifi b/config/rootfiles/common/madwifi
index d4bf0ea14a9db161d2b9ad9f81d7e20f744cce32..692063aa27038e3a06412edc70d6d44f0de066f4 100644 (file)
--- a/config/rootfiles/common/madwifi
+++ b/config/rootfiles/common/madwifi
@@ -1,4 +1,5 @@
 etc/madwifi.conf
 etc/madwifi.conf

+etc/modprobe.d/madwifi

 usr/bin/80211debug
 usr/bin/80211stats
 usr/bin/ath_info
 usr/bin/80211debug
 usr/bin/80211stats
 usr/bin/ath_info

diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index 546077dee1ce8af605aedb7d2f6402fac6820118..cd6a008eec131f348469f82655355224967c61f2 100644 (file)
--- 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
 * 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
 * readline-5.1
 * reiser4progs-1.0.5
 * reiserfsprogs-3.6.19

diff --git a/lfs/initrd b/lfs/initrd
index a98f375fea72a48ea118008c2825bbd65c91d848..b4d0e3bcfdb070b1777a77123cf413f81ca90ec9 100644 (file)
--- 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
        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/*
 
        -mkdir -p /install/{images,mnt}
        rm -rf /install/mnt/*
 

diff --git a/lfs/madwifi b/lfs/madwifi
index 509013e2cb20dd05bb7562f99d82e1d4ddb0426c..9f2f9c4db4a33aed49d7720e1b6b72bd83862554 100644 (file)
--- 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
        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)
        @$(POSTBUILD)

diff --git a/src/install+setup/install/main.c b/src/install+setup/install/main.c
index 5e12811b3397d8b9746ed9d54181954420b2e3a3..0fe97a1fdc60813cfa6d0ecda8c502bc0b6ed9fb 100644 (file)
--- 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 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");
        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 0872d25fefe54e6cb7c5828c96b0df09001a1ce0..c56462ee1dd0521e8f08397ca3131ed940edeeba 100644 (file)
--- 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
 
        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"
        MODULE=`basename $MODULE | awk -F. '{ print $1 }'`
        
        echo -n "Probing for $MODULE"