test: use the new sfdisk syntax without disk geometry

diff --git a/test/TEST-01-BASIC/create-root.sh b/test/TEST-01-BASIC/create-root.sh
index 3a62afd1c60af1631c25a85401b5335d34edac96..8b28c30985170d759a970bf84e532064d02622f7 100755 (executable)
--- a/test/TEST-01-BASIC/create-root.sh
+++ b/test/TEST-01-BASIC/create-root.sh
@@ -7,8 +7,8 @@ rm -f -- /etc/lvm/lvm.conf
 udevadm control --reload
 set -e
 # save a partition at the beginning for future flagging purposes
-sfdisk -C 2560 -H 2 -S 32 -L /dev/sda <<EOF
-,16
+sfdisk /dev/sda <<EOF
+,1M
 ,
 EOF
 

diff --git a/test/TEST-02-SYSTEMD/create-root.sh b/test/TEST-02-SYSTEMD/create-root.sh
index b102106e4418b8fb9b1775e5f0fba32d7b339355..0e60e7422cdd2a26d6127e252d3e316740f86192 100755 (executable)
--- a/test/TEST-02-SYSTEMD/create-root.sh
+++ b/test/TEST-02-SYSTEMD/create-root.sh
@@ -7,8 +7,8 @@ rm -f -- /etc/lvm/lvm.conf
 udevadm control --reload
 set -e
 # save a partition at the beginning for future flagging purposes
-sfdisk -C 2560 -H 2 -S 32 -L /dev/sda <<EOF
-,16
+sfdisk /dev/sda <<EOF
+,1M
 ,
 EOF
 

diff --git a/test/TEST-03-USR-MOUNT/create-root.sh b/test/TEST-03-USR-MOUNT/create-root.sh
index f3cecafb24613e42091f12b33204831304b89074..66907e8b97857703e7aee263d72537248bf7bcf3 100755 (executable)
--- a/test/TEST-03-USR-MOUNT/create-root.sh
+++ b/test/TEST-03-USR-MOUNT/create-root.sh
@@ -7,13 +7,13 @@ rm -f -- /etc/lvm/lvm.conf
 udevadm control --reload
 set -e
 # save a partition at the beginning for future flagging purposes
-sfdisk -C 5120 -H 2 -S 32 -L /dev/sda <<EOF
-,16
+sfdisk /dev/sda <<EOF
+,1M
 ,
 EOF
 
-sfdisk -C 5120 -H 2 -S 32 -L /dev/sdb <<EOF
-,16
+sfdisk /dev/sdb <<EOF
+,1M
 ,
 EOF
 

diff --git a/test/TEST-04-FULL-SYSTEMD/create-root.sh b/test/TEST-04-FULL-SYSTEMD/create-root.sh
index 86ad44911ac0971ccc926c24e2498d7c96b086ad..5972bd39bb05a002c83b07839797c55ab0b4b730 100755 (executable)
--- a/test/TEST-04-FULL-SYSTEMD/create-root.sh
+++ b/test/TEST-04-FULL-SYSTEMD/create-root.sh
@@ -7,13 +7,13 @@ rm -f -- /etc/lvm/lvm.conf
 udevadm control --reload
 set -e
 # save a partition at the beginning for future flagging purposes
-sfdisk -C 10240 -H 2 -S 32 -L /dev/sda <<EOF
-,16
+sfdisk /dev/sda <<EOF
+,1M
 ,
 EOF
 
-sfdisk -C 10240 -H 2 -S 32 -L /dev/sdb <<EOF
-,16
+sfdisk /dev/sdb <<EOF
+,1M
 ,
 EOF
 

diff --git a/test/TEST-10-RAID/create-root.sh b/test/TEST-10-RAID/create-root.sh
index 505541321fda2a1705ece4d51a8eb51a37299ce1..151f3e09b73cf0d4e0fed246de301f7f8a5f46d7 100755 (executable)
--- a/test/TEST-10-RAID/create-root.sh
+++ b/test/TEST-10-RAID/create-root.sh
@@ -6,11 +6,11 @@ done
 rm -f -- /etc/lvm/lvm.conf
 udevadm control --reload
 # save a partition at the beginning for future flagging purposes
-sfdisk -C 2560 -H 2 -S 32 -L /dev/sda <<EOF
-,32
-,800
-,800
-,800
+sfdisk /dev/sda <<EOF
+,4M
+,25M
+,25M
+,25M
 EOF
 udevadm settle
 mdadm --create /dev/md0 --run --auto=yes --level=5 --raid-devices=3 /dev/sda2 /dev/sda3 /dev/sda4

diff --git a/test/TEST-11-LVM/create-root.sh b/test/TEST-11-LVM/create-root.sh
index a97fa587d580c6ac7e929d0f92aeb6f34e873144..f62341122f10e8aedb699038ab559c819f76de63 100755 (executable)
--- a/test/TEST-11-LVM/create-root.sh
+++ b/test/TEST-11-LVM/create-root.sh
@@ -6,11 +6,11 @@ done
 rm -f -- /etc/lvm/lvm.conf
 udevadm control --reload
 # save a partition at the beginning for future flagging purposes
-sfdisk -C 1280 -H 2 -S 32 -L /dev/sda <<EOF
-,1
-,400
-,400
-,400
+sfdisk /dev/sda <<EOF
+,1M
+,10M
+,10M
+,10M
 EOF
 udevadm settle
 for i in sda2 sda3 sda4; do

diff --git a/test/TEST-12-RAID-DEG/create-root.sh b/test/TEST-12-RAID-DEG/create-root.sh
index 699c27c085670f7dba68cc3dbcbeba71fc37f71d..e989f67a3441de4811c557caf24f22234a3f6f76 100755 (executable)
--- a/test/TEST-12-RAID-DEG/create-root.sh
+++ b/test/TEST-12-RAID-DEG/create-root.sh
@@ -9,11 +9,11 @@ done
 rm -f -- /etc/lvm/lvm.conf
 udevadm control --reload
 # save a partition at the beginning for future flagging purposes
-sfdisk -C 1280 -H 2 -S 32 -L /dev/sda <<EOF
-,16
-,400
-,400
-,400
+sfdisk /dev/sda <<EOF
+,5M
+,10M
+,10M
+,10M
 EOF
 udevadm settle
 mdadm --create /dev/md0 --run --auto=yes --level=5 --raid-devices=3 /dev/sdb /dev/sdc /dev/sdd

diff --git a/test/TEST-13-ENC-RAID-LVM/create-root.sh b/test/TEST-13-ENC-RAID-LVM/create-root.sh
index af83c23871a7e5be43bb2f0d7e5f5b38629bc8b2..e74fe7f9ab363bc92641350640e876e979375ad3 100755 (executable)
--- a/test/TEST-13-ENC-RAID-LVM/create-root.sh
+++ b/test/TEST-13-ENC-RAID-LVM/create-root.sh
@@ -7,11 +7,11 @@ done
 rm -f -- /etc/lvm/lvm.conf
 udevadm control --reload
 # save a partition at the beginning for future flagging purposes
-sfdisk -C 2560 -H 2 -S 32 -L /dev/sda <<EOF
-,16
-,800
-,800
-,800
+sfdisk /dev/sda <<EOF
+,4M
+,25M
+,25M
+,25M
 EOF
 udevadm settle
 echo -n test >keyfile

diff --git a/test/TEST-14-IMSM/create-root.sh b/test/TEST-14-IMSM/create-root.sh
index 83a7fba6919dccb78698761fb43589abb1cc0106..f637ec8835332f014e836dab9111011349ef9a70 100755 (executable)
--- a/test/TEST-14-IMSM/create-root.sh
+++ b/test/TEST-14-IMSM/create-root.sh
@@ -22,13 +22,16 @@ for s in $SETS; do
 done
 
 udevadm settle
+sleep 1
+udevadm settle
+
 sfdisk -g /dev/mapper/isw*Test0
 # save a partition at the beginning for future flagging purposes
-sfdisk -C 2560 -H 2 -S 32 -L /dev/mapper/isw*Test0 <<EOF
-,1
-,600
-,600
-,600
+sfdisk --no-reread /dev/mapper/isw*Test0 <<EOF
+,4M
+,20M
+,20M
+,20M
 EOF
 
 udevadm settle

diff --git a/test/TEST-15-BTRFSRAID/create-root.sh b/test/TEST-15-BTRFSRAID/create-root.sh
index b92f9c00dd2578e11b0fb10cb1da5750db5ca4f2..f4062f5b4b2e4f71c5a83aaa9bafed6f2025221b 100755 (executable)
--- a/test/TEST-15-BTRFSRAID/create-root.sh
+++ b/test/TEST-15-BTRFSRAID/create-root.sh
@@ -5,24 +5,21 @@ for x in 64-lvm.rules 70-mdadm.rules 99-mount-rules; do
 done
 udevadm control --reload
 # save a partition at the beginning for future flagging purposes
-sfdisk  -C 327800 -H 2 -S 32 -L /dev/sda <<EOF
-,16
-,,E
-;
-;
-,5120
-,5120
-,5120
-,5120
+sfdisk -X gpt /dev/sda <<EOF
+,10M
+,200M
+,200M
+,200M
+,200M
 EOF
 udevadm settle
-mkfs.btrfs -draid10 -mraid10 -L root /dev/sda5 /dev/sda6 /dev/sda7 /dev/sda8
+mkfs.btrfs -draid10 -mraid10 -L root /dev/sda2 /dev/sda3 /dev/sda4 /dev/sda5
 udevadm settle
 btrfs device scan
 udevadm settle
 set -e
 mkdir -p /sysroot
-mount -t btrfs /dev/sda8 /sysroot
+mount -t btrfs /dev/sda5 /sysroot
 cp -a -t /sysroot /source/*
 umount /sysroot
 echo "dracut-root-block-created" >/dev/sda1

diff --git a/test/TEST-15-BTRFSRAID/test.sh b/test/TEST-15-BTRFSRAID/test.sh
index 569b306a99c16943c361cf2d23362347bff93bb4..761d5bd7657ac203554fc3f0ad61953956cc130a 100755 (executable)
--- a/test/TEST-15-BTRFSRAID/test.sh
+++ b/test/TEST-15-BTRFSRAID/test.sh
@@ -13,7 +13,7 @@ test_run() {
        -net none -kernel /boot/vmlinuz-$KVERSION \
        -append "root=LABEL=root rw rd.retry=3 rd.info console=ttyS0,115200n81 selinux=0 $DEBUGFAIL" \
        -initrd $TESTDIR/initramfs.testing
-    dd if=$DISKIMAGE bs=512 count=2 | grep -F -m 1 -q dracut-root-block-success $DISKIMAGE || return 1
+    dd if=$DISKIMAGE bs=512 count=4 skip=2048 | grep -F -m 1 -q dracut-root-block-success $DISKIMAGE || return 1
 }
 
 test_setup() {
@@ -82,7 +82,7 @@ test_setup() {
        -append "root=/dev/fakeroot rw quiet console=ttyS0,115200n81 selinux=0" \
        -initrd $TESTDIR/initramfs.makeroot  || return 1
 
-    dd if=$DISKIMAGE bs=512 count=2 | grep -F -m 1 -q dracut-root-block-created || return 1
+    dd if=$DISKIMAGE bs=512 count=4 skip=2048 | grep -F -m 1 -q dracut-root-block-created || return 1
 
    (
         export initdir=$TESTDIR/overlay

diff --git a/test/TEST-17-LVM-THIN/create-root.sh b/test/TEST-17-LVM-THIN/create-root.sh
index 416c3c3f0496dc36bd6a7a37beb7e505ef96681c..117d134157a33dd5b7d59c994ac9826c1815ec00 100755 (executable)
--- a/test/TEST-17-LVM-THIN/create-root.sh
+++ b/test/TEST-17-LVM-THIN/create-root.sh
@@ -6,11 +6,11 @@ done
 rm -f -- /etc/lvm/lvm.conf
 udevadm control --reload
 # save a partition at the beginning for future flagging purposes
-sfdisk -C 2560 -H 2 -S 32 -L /dev/sda <<EOF
-,1
-,800
-,800
-,800
+sfdisk /dev/sda <<EOF
+,4M
+,25M
+,25M
+,25M
 EOF
 udevadm settle
 for i in sda2 sda3 sda4; do