From 8d7c07f191524f2ac59e3083910db985fa4bbcd5 Mon Sep 17 00:00:00 2001

From: Adam Williamson <awilliam@redhat.com>

Date: Wed, 22 May 2013 13:56:58 -0700

Subject: [PATCH] don't specify "p" as a separator for dmraid arrays (RHBZ

 #966162)

As per RHBZ #966162, parted stopped unconditionally using "p" as a

separator for dmraid device names in version 3.1, so other things need

to fall in line with that convention now.

---

 modules.d/90dmraid/dmraid.sh | 4 ++--

 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules.d/90dmraid/dmraid.sh b/modules.d/90dmraid/dmraid.sh

index 68e0515..3753ddd 100755

--- a/modules.d/90dmraid/dmraid.sh

+++ b/modules.d/90dmraid/dmraid.sh

@@ -28,7 +28,7 @@ if [ -n "$DM_RAIDS" ] || getargbool 0 rd.auto; then

                 if [ "${s##$r}" != "$s" ]; then

                     info "Activating $s"

                     dmraid -ay -i -p --rm_partitions "$s" 2>&1 | vinfo

-                    [ -e "/dev/mapper/$s" ] && kpartx -a -p p "/dev/mapper/$s" 2>&1 | vinfo

+                    [ -e "/dev/mapper/$s" ] && kpartx -a "/dev/mapper/$s" 2>&1 | vinfo

                     udevsettle

                 fi

             done

@@ -38,7 +38,7 @@ if [ -n "$DM_RAIDS" ] || getargbool 0 rd.auto; then

         for s in $SETS; do

             info "Activating $s"

             dmraid -ay -i -p --rm_partitions "$s" 2>&1 | vinfo

-            [ -e "/dev/mapper/$s" ] && kpartx -a -p p "/dev/mapper/$s" 2>&1 | vinfo

+            [ -e "/dev/mapper/$s" ] && kpartx -a "/dev/mapper/$s" 2>&1 | vinfo

         done

     fi