From: Harald Hoyer <harald@redhat.com>
Date: Fri, 24 Jan 2014 10:55:27 +0000 (+0100)
Subject: Revert "dmraid: let dmraid setup the partitions"
X-Git-Tag: 035~13
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=dade93b4eb9dfe8e2856e2b8bba0575235940f2b;p=thirdparty%2Fdracut.git

Revert "dmraid: let dmraid setup the partitions"

This reverts commit fbf717086e8b02947a27f55d1759cccd1cb89e99.

dmraid seems to use "p" as a seperator by default.

Reverting to kpartx, until this is fixed.
---

diff --git a/modules.d/90dmraid/dmraid.sh b/modules.d/90dmraid/dmraid.sh
index dfd0f1cbb..3753ddd7e 100755
--- a/modules.d/90dmraid/dmraid.sh
+++ b/modules.d/90dmraid/dmraid.sh
@@ -27,7 +27,8 @@ if [ -n "$DM_RAIDS" ] || getargbool 0 rd.auto; then
             for s in $SETS; do
                 if [ "${s##$r}" != "$s" ]; then
                     info "Activating $s"
-                    dmraid -ay -i --rm_partitions "$s" 2>&1 | vinfo
+                    dmraid -ay -i -p --rm_partitions "$s" 2>&1 | vinfo
+                    [ -e "/dev/mapper/$s" ] && kpartx -a "/dev/mapper/$s" 2>&1 | vinfo
                     udevsettle
                 fi
             done
@@ -36,7 +37,8 @@ if [ -n "$DM_RAIDS" ] || getargbool 0 rd.auto; then
     # scan and activate all DM RAIDS
         for s in $SETS; do
             info "Activating $s"
-            dmraid -ay -i --rm_partitions "$s" 2>&1 | vinfo
+            dmraid -ay -i -p --rm_partitions "$s" 2>&1 | vinfo
+            [ -e "/dev/mapper/$s" ] && kpartx -a "/dev/mapper/$s" 2>&1 | vinfo
         done
     fi