From 184cc440ced65cba8c6113c4739acbf0d511320f Mon Sep 17 00:00:00 2001
From: Thomas Bächler <thomas@archlinux.org>
Date: Thu, 11 Jan 2007 19:03:25 +0000
Subject: fixed raid autodetection for newer kernels

git-svn-id: http://projects.archlinux.org/svn/initramfs/mkinitcpio@191 880c04e9-e011-0410-abf7-b926e227c9cd
---
 install/autodetect | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/install/autodetect b/install/autodetect
index a743601..e52220e 100644
--- a/install/autodetect
+++ b/install/autodetect
@@ -8,7 +8,7 @@ install ()
                     -e '/usb/' -e '/ide/' -e '/ieee1394/' -e '/cdrom' \
                     -e '/net/' -e '/pcmcia' -e '/ata')"
 
-    
+
     #Filesystem detection, use sysfs instead of /proc
     findfs ()
     {
@@ -19,7 +19,7 @@ install ()
             fi
         done
     }
- 
+
     if [ $UID -eq 0 -o "$(groups | grep disk)" != "" ]; then
         for fs in $(findfs | sort | uniq); do
             for mod in $(find "${MODULEDIR}" -type f -name "${fs}.ko"); do
@@ -30,9 +30,15 @@ install ()
         done
 
         if [ -e /sbin/mdadm ]; then
-            AUTODETECT="$AUTODETECT
-                      $(mdadm -E -s /dev/hd* /dev/sd* /dev/rd/* /dev/ida/* /dev/cciss/* /dev/ataraid/* \
-                        | awk -Flevel= '{print $2}' | awk '{print $1}')"
+            for raidmod in $(mdadm -E -s /dev/hd* /dev/sd* /dev/rd/* /dev/ida/* /dev/cciss/* /dev/ataraid/* \
+                        | awk -Flevel= '{print $2}' | awk '{print $1}'); do
+                case "${raidmod}" in
+                    raid4|raid5|raid6)
+                        AUTODETECT="${AUTODETECT} raid456" ;;
+                    *)
+                        AUTODETECT="${AUTODETECT} ${raidmod}" ;;
+                esac
+            done
         fi
     else
         err "User does not have proper permissions to read superblocks, raid and filesystem modules are not detected"
-- 
cgit v1.2.3-24-g4f1b