test: add udev settle after sfdisk

diff --git a/test/TEST-01-BASIC/create-root.sh b/test/TEST-01-BASIC/create-root.sh
index 96e3c339c95e287846652ee59df7ed5278290ec1..3a62afd1c60af1631c25a85401b5335d34edac96 100755 (executable)
--- a/test/TEST-01-BASIC/create-root.sh
+++ b/test/TEST-01-BASIC/create-root.sh
@@ -12,6 +12,7 @@ sfdisk -C 2560 -H 2 -S 32 -L /dev/sda <<EOF
 ,
 EOF
 
+udevadm settle
 mkfs.ext3 -L dracut /dev/sda2
 mkdir -p /root
 mount /dev/sda2 /root

diff --git a/test/TEST-02-SYSTEMD/create-root.sh b/test/TEST-02-SYSTEMD/create-root.sh
index 682e472bfe9a16686b6d9f058f3d5544ef42cc44..b102106e4418b8fb9b1775e5f0fba32d7b339355 100755 (executable)
--- a/test/TEST-02-SYSTEMD/create-root.sh
+++ b/test/TEST-02-SYSTEMD/create-root.sh
@@ -12,6 +12,7 @@ sfdisk -C 2560 -H 2 -S 32 -L /dev/sda <<EOF
 ,
 EOF
 
+udevadm settle
 mkfs.ext3 -L dracut /dev/sda2
 mkdir -p /root
 mount /dev/sda2 /root

diff --git a/test/TEST-03-USR-MOUNT/create-root.sh b/test/TEST-03-USR-MOUNT/create-root.sh
index 961392f64b249297c84557829a0b0f2323bc97bf..f3cecafb24613e42091f12b33204831304b89074 100755 (executable)
--- a/test/TEST-03-USR-MOUNT/create-root.sh
+++ b/test/TEST-03-USR-MOUNT/create-root.sh
@@ -17,6 +17,7 @@ sfdisk -C 5120 -H 2 -S 32 -L /dev/sdb <<EOF
 ,
 EOF
 
+udevadm settle
 modprobe btrfs
 mkfs.btrfs -L dracut /dev/sda2
 mkfs.btrfs -L dracutusr /dev/sdb2

diff --git a/test/TEST-04-FULL-SYSTEMD/create-root.sh b/test/TEST-04-FULL-SYSTEMD/create-root.sh
index fb462abf075b09b17f5d9541e7889034988633af..86ad44911ac0971ccc926c24e2498d7c96b086ad 100755 (executable)
--- a/test/TEST-04-FULL-SYSTEMD/create-root.sh
+++ b/test/TEST-04-FULL-SYSTEMD/create-root.sh
@@ -17,6 +17,7 @@ sfdisk -C 10240 -H 2 -S 32 -L /dev/sdb <<EOF
 ,
 EOF
 
+udevadm settle
 
 mkfs.btrfs -L dracut /dev/sda2
 mkfs.btrfs -L dracutusr /dev/sdb2

diff --git a/test/TEST-10-RAID/create-root.sh b/test/TEST-10-RAID/create-root.sh
index 68face8a68d385d43a61d33ec4464cb2951297c4..505541321fda2a1705ece4d51a8eb51a37299ce1 100755 (executable)
--- a/test/TEST-10-RAID/create-root.sh
+++ b/test/TEST-10-RAID/create-root.sh
@@ -12,6 +12,7 @@ sfdisk -C 2560 -H 2 -S 32 -L /dev/sda <<EOF
 ,800
 ,800
 EOF
+udevadm settle
 mdadm --create /dev/md0 --run --auto=yes --level=5 --raid-devices=3 /dev/sda2 /dev/sda3 /dev/sda4
 # wait for the array to finish initailizing, otherwise this sometimes fails
 # randomly.

diff --git a/test/TEST-11-LVM/create-root.sh b/test/TEST-11-LVM/create-root.sh
index 0ab04968e6b51cf4d55a69be517005723d221624..a97fa587d580c6ac7e929d0f92aeb6f34e873144 100755 (executable)
--- a/test/TEST-11-LVM/create-root.sh
+++ b/test/TEST-11-LVM/create-root.sh
@@ -12,6 +12,7 @@ sfdisk -C 1280 -H 2 -S 32 -L /dev/sda <<EOF
 ,400
 ,400
 EOF
+udevadm settle
 for i in sda2 sda3 sda4; do
 lvm pvcreate -ff  -y /dev/$i ;
 done && \

diff --git a/test/TEST-12-RAID-DEG/create-root.sh b/test/TEST-12-RAID-DEG/create-root.sh
index 7561be190747a44728365a95aa871b221045c1ec..699c27c085670f7dba68cc3dbcbeba71fc37f71d 100755 (executable)
--- a/test/TEST-12-RAID-DEG/create-root.sh
+++ b/test/TEST-12-RAID-DEG/create-root.sh
@@ -15,6 +15,7 @@ sfdisk -C 1280 -H 2 -S 32 -L /dev/sda <<EOF
 ,400
 ,400
 EOF
+udevadm settle
 mdadm --create /dev/md0 --run --auto=yes --level=5 --raid-devices=3 /dev/sdb /dev/sdc /dev/sdd
 # wait for the array to finish initailizing, otherwise this sometimes fails
 # randomly.

diff --git a/test/TEST-13-ENC-RAID-LVM/create-root.sh b/test/TEST-13-ENC-RAID-LVM/create-root.sh
index 4260e86ac6177b0a9ba90ca206b92729e72b82af..af83c23871a7e5be43bb2f0d7e5f5b38629bc8b2 100755 (executable)
--- a/test/TEST-13-ENC-RAID-LVM/create-root.sh
+++ b/test/TEST-13-ENC-RAID-LVM/create-root.sh
@@ -13,6 +13,7 @@ sfdisk -C 2560 -H 2 -S 32 -L /dev/sda <<EOF
 ,800
 ,800
 EOF
+udevadm settle
 echo -n test >keyfile
 cryptsetup -q luksFormat /dev/sda2 /keyfile
 cryptsetup -q luksFormat /dev/sda3 /keyfile

diff --git a/test/TEST-15-BTRFSRAID/create-root.sh b/test/TEST-15-BTRFSRAID/create-root.sh
index 69f9280cee9243bd758e107144103be4a5a50c9c..b92f9c00dd2578e11b0fb10cb1da5750db5ca4f2 100755 (executable)
--- a/test/TEST-15-BTRFSRAID/create-root.sh
+++ b/test/TEST-15-BTRFSRAID/create-root.sh
@@ -15,14 +15,15 @@ sfdisk  -C 327800 -H 2 -S 32 -L /dev/sda <<EOF
 ,5120
 ,5120
 EOF
+udevadm settle
 mkfs.btrfs -draid10 -mraid10 -L root /dev/sda5 /dev/sda6 /dev/sda7 /dev/sda8
 udevadm settle
 btrfs device scan
 udevadm settle
 set -e
-mkdir -p /sysroot 
-mount -t btrfs /dev/sda8 /sysroot 
-cp -a -t /sysroot /source/* 
-umount /sysroot 
+mkdir -p /sysroot
+mount -t btrfs /dev/sda8 /sysroot
+cp -a -t /sysroot /source/*
+umount /sysroot
 echo "dracut-root-block-created" >/dev/sda1
 poweroff -f

diff --git a/test/TEST-17-LVM-THIN/create-root.sh b/test/TEST-17-LVM-THIN/create-root.sh
index 740704f6738e837d100832ec086d093a23c3860c..416c3c3f0496dc36bd6a7a37beb7e505ef96681c 100755 (executable)
--- a/test/TEST-17-LVM-THIN/create-root.sh
+++ b/test/TEST-17-LVM-THIN/create-root.sh
@@ -12,6 +12,7 @@ sfdisk -C 2560 -H 2 -S 32 -L /dev/sda <<EOF
 ,800
 ,800
 EOF
+udevadm settle
 for i in sda2 sda3 sda4; do
 lvm pvcreate -ff  -y /dev/$i ;
 done && \