From 1db1dba1853f6a3d45b10552ab167f60e156f403 Mon Sep 17 00:00:00 2001
From: Peter Jones <pjones@redhat.com>
Date: Thu, 31 Aug 2006 22:21:28 +0000
Subject: - make multipath partitions be named with the form
 "${device}p${partnum}",   like in nash and parted and anaconda and md
 partitions and... - make dmraid partitions be named with "p" as well (and use
 kpartx)

---
 rc.d/rc.sysinit | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'rc.d/rc.sysinit')

diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit
index a1c3e6b4..00c105fc 100755
--- a/rc.d/rc.sysinit
+++ b/rc.d/rc.sysinit
@@ -411,17 +411,19 @@ if [ -c /dev/mapper/control ]; then
 		modprobe dm-multipath > /dev/null 2>&1
 		/sbin/multipath.static -v 0
 		if [ -x /sbin/kpartx ]; then
-			/sbin/dmsetup ls --target multipath --exec "/sbin/kpartx -a"
+			/sbin/dmsetup ls --target multipath --exec "/sbin/kpartx -a -p p"
 		fi
 	fi
 	
 	if [ -x /sbin/dmraid ]; then
 		modprobe dm-mirror >/dev/null 2>&1
-		for x in $(/sbin/dmraid -ay -t --ignorelocking 2>/dev/null | egrep -iv "^[nN]o " | awk -F ':' '{ print $1 }') ; do
+		for x in $(/sbin/dmraid -ay -i -p -t 2>/dev/null | \
+				egrep -iv "^no " | \
+				awk -F ':' '{ print $1 }') ; do
 			dmname=$(resolve_dm_name $x)
-			if [ -z "$dmname" ]; then
-				/sbin/dmraid -ay --ignorelocking "$x"
-			fi
+			[ -n "$dmname" ] && continue
+			/sbin/dmraid -ay -i -p "$dmname" >/dev/null 2>&1
+			/sbin/kpartx -a -p p "/dev/mapper/$dmname"
 		done
 	fi
 	
-- 
cgit v1.2.1