test: double disk space for root images

test/TEST-11-LVM/create-root.sh

@@ -6,11 +6,11 @@ done
 rm /etc/lvm/lvm.conf
 udevadm control --reload-rules
 # save a partition at the beginning for future flagging purposes
-sfdisk -C 640 -H 2 -S 32 -L /dev/sda <<EOF
+sfdisk -C 1280 -H 2 -S 32 -L /dev/sda <<EOF
 ,1
-,213
+,400
-,213
+,400
-,213
+,400
 EOF
 for i in sda2 sda3 sda4; do
 lvm pvcreate -ff  -y /dev/$i ;

test/TEST-11-LVM/test.sh

@@ -16,7 +16,7 @@ test_run() {
 
 test_setup() {
     # Create the blank file to use as a root filesystem
-    dd if=/dev/zero of=root.ext2 bs=1M count=20
+    dd if=/dev/zero of=root.ext2 bs=1M count=40
 
     kernel=$KVERSION
     # Create what will eventually be our root filesystem onto an overlay

test/TEST-14-IMSM/create-root.sh

@@ -22,19 +22,20 @@ for s in $SETS; do
 done
 
 udevadm settle
-
+sfdisk -g /dev/mapper/isw*Test0 
 # save a partition at the beginning for future flagging purposes
-sfdisk -H 255 -S 63 -L /dev/mapper/isw*Test0 <<EOF
+sfdisk -C 1280 -H 2 -S 32 -L /dev/mapper/isw*Test0 <<EOF
 ,1
-,1
+,300
-,1
+,300
-,
+,300
 EOF
+
 udevadm settle
 dmraid -a n
 udevadm settle
 
-SETS=$(dmraid -c -s)
+SETS=$(dmraid -c -s -i)
 # scan and activate all DM RAIDS
 for s in $SETS; do
    dmraid -ay -i -p --rm_partitions "$s" 
@@ -44,9 +45,9 @@ done
 udevadm settle
 
 mdadm --create /dev/md0 --run --auto=yes --level=5 --raid-devices=3 \
-	/dev/mapper/isw*p1 \
 	/dev/mapper/isw*p2 \
-	/dev/mapper/isw*p3 
+	/dev/mapper/isw*p3 \
+	/dev/mapper/isw*p4 
 
 # wait for the array to finish initailizing, otherwise this sometimes fails
 # randomly.