r42 - mdadm/trunk/debian

[madduck at users.alioth.debian.org]

Author: madduck
Date: 2006-07-31 10:28:13 +0000 (Mon, 31 Jul 2006)
New Revision: 42

Modified:
   mdadm/trunk/debian/mdadm.config
Log:
added detection for partitionable arrays

Modified: mdadm/trunk/debian/mdadm.config
===================================================================
--- mdadm/trunk/debian/mdadm.config	2006-07-31 09:33:21 UTC (rev 41)
+++ mdadm/trunk/debian/mdadm.config	2006-07-31 10:28:13 UTC (rev 42)
@@ -77,19 +77,22 @@
       ARRAYS=''
       ERROR=0
       for i in $INITRDSTART; do
+
+        # just in case people use commas between devices
+        i="${i%,}"
+
+        # standardise by prefixing /dev/
+        case "$i" in md*) i="/dev/$i";; *) :;; esac
+
+        # remove partition from name of partitionable devices
+        i="${i%p[0-9]*}"
+
         case "$i" in
-          /dev/md*)
-            t=${i%,} # just in case people use commas between devices
-            [ -b "$t" ] && ARRAYS="${ARRAYS:+$ARRAYS }$t" && continue
-            echo "E: invalid device: $i" >&2
+          /dev/md[0-9]*|/dev/md_d[0-9]*)
+            [ -b "$i" ] && ARRAYS="${ARRAYS:+$ARRAYS }$i" && continue
+            echo "E: device does not exist: $i" >&2
             ERROR=1; break
             ;;
-          md*)
-            t=/dev/${i%,} # just in case people use commas between devices
-            [ -b "$t" ] && ARRAYS="${ARRAYS:+$ARRAYS }$t" && continue
-            echo "E: invalid device: $i" >&2
-            ERROR=1; break
-            ;;
           *)
             echo "E: unrecognised device string: $i" >&2
             ERROR=1; break