dmraid: use and install kpartx for dmraids

diff --git a/modules.d/90dmraid/install b/modules.d/90dmraid/install
index 2ec7f76e6c01d99d50188f2f50f9f53181b00577..816512e034226d36ccd0727fd12d9cf2e8d1f4a3 100755 (executable)
--- a/modules.d/90dmraid/install
+++ b/modules.d/90dmraid/install
@@ -1,5 +1,5 @@
 #!/bin/bash
-dracut_install dmraid partx
+dracut_install dmraid partx kpartx
 inst "$moddir/dmraid.sh" /sbin/dmraid_scan
 
 if [ ! -x /lib/udev/vol_id ]; then

diff --git a/test/TEST-14-IMSM/create-root.sh b/test/TEST-14-IMSM/create-root.sh
index 0af79fa408e13dad4d7e4aebe9b68081685b56d0..227887866c87b1b26479850cf7cfa185efa5bfb0 100755 (executable)
--- a/test/TEST-14-IMSM/create-root.sh
+++ b/test/TEST-14-IMSM/create-root.sh
@@ -6,7 +6,16 @@ done
 udevadm control --reload-rules
 echo y|dmraid -f isw -C Test0 --type 1 --disk "/dev/sdb /dev/sdc" 
 udevadm settle
-dmraid -a y
+
+SETS=$(dmraid -c -s)
+# scan and activate all DM RAIDS
+for s in $SETS; do
+   dmraid -ay -i -p --rm_partitions "$s" 
+   [ -e "/dev/mapper/$s" ] && kpartx -a -p p "/dev/mapper/$s" 
+done
+
+udevadm settle
+
 # save a partition at the beginning for future flagging purposes
 sfdisk -H 255 -S 63 -L /dev/mapper/isw*Test0 <<EOF
 ,1
@@ -17,9 +26,15 @@ EOF
 udevadm settle
 dmraid -a n
 udevadm settle
-dmraid -a y
+
+SETS=$(dmraid -c -s)
+# scan and activate all DM RAIDS
+for s in $SETS; do
+   dmraid -ay -i -p --rm_partitions "$s" 
+   [ -e "/dev/mapper/$s" ] && kpartx -a -p p "/dev/mapper/$s" 
+done
+
 udevadm settle
-sfdisk -l /dev/mapper/isw*Test0
 
 mdadm --create /dev/md0 --run --auto=yes --level=5 --raid-devices=3 /dev/mapper/isw*p[123]
 # wait for the array to finish initailizing, otherwise this sometimes fails