a56a5e
From b1cdf7c5d4df3221504c34010985254f4261b3dd Mon Sep 17 00:00:00 2001
966cef
From: Harald Hoyer <harald@redhat.com>
966cef
Date: Fri, 24 Jan 2014 11:55:27 +0100
966cef
Subject: [PATCH] Revert "dmraid: let dmraid setup the partitions"
966cef
966cef
This reverts commit fbf717086e8b02947a27f55d1759cccd1cb89e99.
966cef
966cef
dmraid seems to use "p" as a seperator by default.
966cef
966cef
Reverting to kpartx, until this is fixed.
966cef
---
966cef
 modules.d/90dmraid/dmraid.sh | 6 ++++--
966cef
 1 file changed, 4 insertions(+), 2 deletions(-)
966cef
966cef
diff --git a/modules.d/90dmraid/dmraid.sh b/modules.d/90dmraid/dmraid.sh
1755ca
index dfd0f1cb..3753ddd7 100755
966cef
--- a/modules.d/90dmraid/dmraid.sh
966cef
+++ b/modules.d/90dmraid/dmraid.sh
966cef
@@ -27,7 +27,8 @@ if [ -n "$DM_RAIDS" ] || getargbool 0 rd.auto; then
966cef
             for s in $SETS; do
966cef
                 if [ "${s##$r}" != "$s" ]; then
966cef
                     info "Activating $s"
966cef
-                    dmraid -ay -i --rm_partitions "$s" 2>&1 | vinfo
966cef
+                    dmraid -ay -i -p --rm_partitions "$s" 2>&1 | vinfo
966cef
+                    [ -e "/dev/mapper/$s" ] && kpartx -a "/dev/mapper/$s" 2>&1 | vinfo
966cef
                     udevsettle
966cef
                 fi
966cef
             done
966cef
@@ -36,7 +37,8 @@ if [ -n "$DM_RAIDS" ] || getargbool 0 rd.auto; then
966cef
     # scan and activate all DM RAIDS
966cef
         for s in $SETS; do
966cef
             info "Activating $s"
966cef
-            dmraid -ay -i --rm_partitions "$s" 2>&1 | vinfo
966cef
+            dmraid -ay -i -p --rm_partitions "$s" 2>&1 | vinfo
966cef
+            [ -e "/dev/mapper/$s" ] && kpartx -a "/dev/mapper/$s" 2>&1 | vinfo
966cef
         done
966cef
     fi
966cef