r97 - mdadm/trunk/debian/initramfs

[madduck at users.alioth.debian.org]

Author: madduck
Date: 2006-08-10 11:17:28 +0000 (Thu, 10 Aug 2006)
New Revision: 97

Modified:
   mdadm/trunk/debian/initramfs/hook
Log:
improve hook

Modified: mdadm/trunk/debian/initramfs/hook
===================================================================
--- mdadm/trunk/debian/initramfs/hook	2006-08-10 11:17:14 UTC (rev 96)
+++ mdadm/trunk/debian/initramfs/hook	2006-08-10 11:17:28 UTC (rev 97)
@@ -46,17 +46,18 @@
 if [ "$INITRDSTART" != none ]; then
   eval $(mdadm --examine --scan --config=partitions \
     | while read a dev level num uuid; do
+      case "$dev" in
+        (/dev/md[0-9]*)
+          devfs_name="/dev/md/${dev#/dev/md}"
+            if [ -b "$dev" ] && [ -b "$devfs_name" ] \
+                && expr "$INITRDSTART" : ".*${devfs_name}.*" >/dev/null; then
+              echo "W: mdadm: both $dev and $devfs_name exist, and $devfs_name appears to be used." >&2
+              echo "W: mdadm: applying workaround for mdadm bug, don't worry! (see #381181)" >&2
+              dev="$devfs_name"
+            fi
+          ;;
+      esac
 
-      if expr "$dev" : '/dev/md[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
-          echo "W: mdadm: both $dev and $devfs_name exist, and $devfs_name appears to be used." >&2
-          echo "W: mdadm: applying workaround for mdadm bug, don't worry! (see #381181)" >&2
-          dev="$devfs_name"
-        fi
-      fi
-
       if [ "$INITRDSTART" = all ] || expr "$INITRDSTART" : ".*${dev}.*" >/dev/null; then
           uuid="${uuid#*UUID=}"
           DEVS="$DEVS ${dev}=${uuid%% *}"