Misc changes to module detection - tpowa

Config file comments
mdassemble in raid hook + additional raid help


git-svn-id: http://projects.archlinux.org/svn/initramfs/mkinitcpio@40 880c04e9-e011-0410-abf7-b926e227c9cd

6 files changed, 21 insertions, 15 deletions

diff --git a/install/filesystems b/install/filesystems
index c012d1b..1da1f13 100644
--- a/install/filesystems
+++ b/install/filesystems
@@ -2,7 +2,7 @@
 
 install ()
 {
-    MODULES=" $(all_modules '/kernel/fs') "
+    MODULES=" $(all_modules '/kernel/fs' | grep -v "nls") "
     BINARIES=""
     FILES=""
     SCRIPT="filesystems"
diff --git a/install/ide b/install/ide
index cd9625a..bbd1ef5 100644
--- a/install/ide
+++ b/install/ide
@@ -2,11 +2,7 @@
 
 install ()
 {
-    MODULES=""
-    for m in $(all_modules "/ide/");
-    do
-        MODULES="$MODULES $(basename $m)"
-    done
+    MODULES=" $(all_modules "/ide/" | grep -v "legacy") ";
     BINARIES=""
     FILES=""
     SCRIPT="ide"
diff --git a/install/raid b/install/raid
index 6f3c90a..84339c5 100644
--- a/install/raid
+++ b/install/raid
@@ -6,12 +6,24 @@ install ()
     BINARIES=""
     FILES=""
     SCRIPT="raid"
+    add_file "/usr/lib/klibc/bin/mdassemble" "/bin/mdassemble"
 }
 
 help ()
 {
 cat<<HELPEOF
-  This hook loads the necessary modules for an raid root device.
-  Detection will take place at runtime.
+  This hook loads the necessary modules for an raid root device,
+  and assemble the raid device when run.
+
+  Supported Kernel Parameters:
+  * raid=noautodetect : This setting is only effective if set to
+  noautodetect.  When set to noautodetect, the md= parameter is used.
+  * md= ::: TODO ::: md=0,/dev/sda3,/dev/sda4
+
+  Important Note: kinit handles raid assembly by itself.  If you
+  do not need to run any additional hooks on the assembled array
+  (i.e. LVM, encrypted root, etc), it is recommended that you
+  let kinit handle the assembly.  You will still need to load
+  the proper raid* modules via the MODULES setting.
 HELPEOF
 }
diff --git a/install/sata b/install/sata
index 3c33376..708e3ff 100644
--- a/install/sata
+++ b/install/sata
@@ -2,10 +2,7 @@
 
 install ()
 {
-    MODULES=" $(all_modules "scsi/.*ata") "
-    for m in $MODULES; do
-        [ "$m" == "ata_piix" ] && MODULES="$MODULES piix"
-    done
+    MODULES=" $(all_modules "scsi/.*ata") sx8 ahci pdc_adma sd_mod sr_mod piix"
     BINARIES=""
     FILES=""
     SCRIPT="sata"
diff --git a/install/scsi b/install/scsi
index 3e6fa2f..6e822c1 100644
--- a/install/scsi
+++ b/install/scsi
@@ -2,8 +2,8 @@
 
 install ()
 {
-    MODULES=" $(all_modules "/scsi/" | grep -v "ata") 
-              $(all_modules "/block/")
+    MODULES=" $(all_modules "/scsi/" | grep -ve "imm" -e "pdc_adma" -e "ahci" -e "ata" -e "pcmcia" -e "ide") 
+              $(all_modules "/block/" | grep -v "sx8")
               $(all_modules "/fusion/")"
     BINARIES=""
     FILES=""
diff --git a/install/usb b/install/usb
index b7d1de8..4d53e8f 100644
--- a/install/usb
+++ b/install/usb
@@ -2,7 +2,8 @@
 
 install ()
 {
-    MODULES=" $(all_modules "/usb/") usb_storage usbhid"
+    MODULES=" $(all_modules "/usb/" | grep -ve "_cs" -e "sl1811-hcd" -e "isp116x-hcd")
+              usb_storage usbhid sd_mod sr_mod "
     BINARIES=""
     FILES=""
     SCRIPT="usb"