r74 - mdadm/trunk/debian/initramfs

[madduck at users.alioth.debian.org]

Author: madduck
Date: 2006-08-02 21:50:24 +0000 (Wed, 02 Aug 2006)
New Revision: 74

Modified:
   mdadm/trunk/debian/initramfs/hook
Log:
better dealing with partitionable raid arrays

Modified: mdadm/trunk/debian/initramfs/hook
===================================================================
--- mdadm/trunk/debian/initramfs/hook	2006-08-02 20:37:30 UTC (rev 73)
+++ mdadm/trunk/debian/initramfs/hook	2006-08-02 21:50:24 UTC (rev 74)
@@ -47,7 +47,7 @@
   eval $(mdadm --examine --scan --config=partitions \
     | while read a dev level num uuid; do
 
-      if expr "$dev" : '/dev/md[0-9].*' >/dev/null; then
+      if expr "$dev" : '/dev/md(_d)?[0-9].*' >/dev/null; then
         devfs_name="/dev/md/${dev#/dev/md}"
         if [ -b "$dev" ] && [ -b "$devfs_name" ] \
             && expr "$INITRDSTART" : ".*${devfs_name}.*" >/dev/null; then
@@ -58,7 +58,8 @@
       fi
 
       if [ "$INITRDSTART" = all ] || expr "$INITRDSTART" : ".*${dev}.*" >/dev/null; then
-          DEVS="$DEVS ${dev}=${uuid#UUID=}"
+          uuid="${uuid#*UUID=}"
+          DEVS="$DEVS ${dev}=${uuid%% *}"
           LEVELS="$LEVELS ${level#level=}"
       fi