From 8222b504ba5ca258b82f6949b80597b424e1f908 Mon Sep 17 00:00:00 2001
From: Peter Jones <pjones@redhat.com>
Date: Wed, 14 May 2008 14:26:49 -0400
Subject: Make resolve_dm_raid() work when your original raid was set up with
 parameters generated by an older dmraid's "dmraid -ay --test".

---
 rc.d/init.d/functions | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/rc.d/init.d/functions b/rc.d/init.d/functions
index 57340fb6..d54861da 100755
--- a/rc.d/init.d/functions
+++ b/rc.d/init.d/functions
@@ -564,6 +564,13 @@ resolve_dm_name() {
     done
     line=$(echo "$line" | sed -e 's/^[ \t]*//' -e 's/[ \t]*$//' \
                -e 's/ core [12] [[:digit:]]\+ / core [12] [[:digit:]]\\+ /')
+    # XXX PJFIX -- this method of handling extra parameters is really just
+    #              asking for failure -- the better way would be to make
+    #              dmsetup or dmraid be able to do resolve_dm_name for us.
+    if [ "$(echo $line | awk '{ print $3 }')" == "mirror" ]; then
+        line=$(echo "$line" | sed \
+                -e 's/ 1 [[:alpha:]][[:alnum:]_]\+$/\\($\\|&$\\)/')
+    fi
     /sbin/dmsetup table | \
         sed -n -e "s/.*\(no block devices found\|No devices found\).*//" \
                -e "s/\(^[^:]\+\): $line\( \+$\|$\)/\1/p"
-- 
cgit