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

3 files changed, 6 insertions, 4 deletions

diff --git a/hooks/filesystems b/hooks/filesystems
index c676832..0990b4c 100644
--- a/hooks/filesystems
+++ b/hooks/filesystems
@@ -9,7 +9,7 @@ run_hook ()
             msg "Attempting to create root device '${root}'"
             dev_t=$( /bin/parseblock "${root}" )
             if [ "x${dev_t}" != "x" ]; then
-                /bin/mknod "${root}" b ${dev_t}
+                /bin/mknod "${root}" b ${dev_t} >/dev/null 2>&1
                 eval $( /bin/fstype < "${root}" )
             else
                 FSTYPE="unknown"
diff --git a/hooks/raid b/hooks/raid
index d83e2ae..5cf4b2f 100644
--- a/hooks/raid
+++ b/hooks/raid
@@ -1,7 +1,7 @@
 # vim: set ft=sh:
-# kinit handles md/raid assembly we just need modules
 run_hook ()
 {
-    #TODO
-    /bin/modprobe -aq raid0 raid1 raid2 raid5 raid6
+    #TODO scan for these somehow...
+    /bin/modprobe -aq raid0 raid1 raid2 raid5 raid6 >/dev/null 2>&1
+    /bin/mdassemble ${md} ${raid}
 }
diff --git a/hooks/usb b/hooks/usb
index 5766ef9..89af004 100644
--- a/hooks/usb
+++ b/hooks/usb
@@ -3,5 +3,7 @@ run_hook ()
 {
     msg -n "Loading usb modules..."
     /bin/modprobe -aq $(/bin/cat /sys/bus/usb/devices/*/modalias) >/dev/null 2>&1
+    #allow 'usbdelay' on the kernel param line
+    /bin/sleep ${usbdelay:-5}
     msg "done."
 }