test: remove obsolete workarounds

diff --git a/test/TEST-10-BASIC/create-root.sh b/test/TEST-10-BASIC/create-root.sh
index 5f600b0af7b0d3b344df050a40b9b7ad449b9bc2..2c583c3290aa591789cd62d2707c21803d5f3ede 100755 (executable)
--- a/test/TEST-10-BASIC/create-root.sh
+++ b/test/TEST-10-BASIC/create-root.sh
@@ -1,15 +1,6 @@
 #!/bin/sh
 
 trap 'poweroff -f' EXIT
-
-# don't let udev and this script step on eachother's toes
-for x in 64-lvm.rules 70-mdadm.rules 99-mount-rules; do
-    : > "/etc/udev/rules.d/$x"
-done
-rm -f -- /etc/lvm/lvm.conf
-udevadm control --reload
-udevadm settle
-
 set -ex
 
 # populate TEST_FSTYPE

diff --git a/test/TEST-11-USR-MOUNT/create-root.sh b/test/TEST-11-USR-MOUNT/create-root.sh
index 734f3776a293a6ff6d12b9bdda5753df8baa7e83..c92ad634073ccc280dbefa2a01d2cb36417a5c70 100755 (executable)
--- a/test/TEST-11-USR-MOUNT/create-root.sh
+++ b/test/TEST-11-USR-MOUNT/create-root.sh
@@ -1,16 +1,8 @@
 #!/bin/sh
 
 trap 'poweroff -f' EXIT
-
-# don't let udev and this script step on eachother's toes
-for x in 64-lvm.rules 70-mdadm.rules 99-mount-rules; do
-    : > "/etc/udev/rules.d/$x"
-done
-rm -f -- /etc/lvm/lvm.conf
-udevadm control --reload
 set -e
 
-udevadm settle
 modprobe btrfs || :
 mkfs.btrfs -q -L dracut /dev/disk/by-id/scsi-0QEMU_QEMU_HARDDISK_root
 mkfs.btrfs -q -L dracutusr /dev/disk/by-id/scsi-0QEMU_QEMU_HARDDISK_usr

diff --git a/test/TEST-20-RAID/create-root.sh b/test/TEST-20-RAID/create-root.sh
index 2bf1754672df0c90107c97aa4c12da9130a7da67..4db5510eca1a41e79b4a87d58adf9b6b54261505 100755 (executable)
--- a/test/TEST-20-RAID/create-root.sh
+++ b/test/TEST-20-RAID/create-root.sh
@@ -1,14 +1,6 @@
 #!/bin/sh
 
 trap 'poweroff -f' EXIT
-
-# don't let udev and this script step on eachother's toes
-for x in 64-lvm.rules 70-mdadm.rules 99-mount-rules; do
-    : > "/etc/udev/rules.d/$x"
-done
-rm -f -- /etc/lvm/lvm.conf
-udevadm control --reload
-udevadm settle
 set -ex
 mdadm --create /dev/md0 --run --auto=yes --level=5 --raid-devices=3 /dev/disk/by-id/scsi-0QEMU_QEMU_HARDDISK_raid[123]
 # wait for the array to finish initializing, otherwise this sometimes fails

diff --git a/test/TEST-21-LVM/create-root.sh b/test/TEST-21-LVM/create-root.sh
index 2386da16a7b6cacb8ec1ba2dd2560884454c4475..ed0ed05014a526fcfcf969a83a70854c48b51080 100755 (executable)
--- a/test/TEST-21-LVM/create-root.sh
+++ b/test/TEST-21-LVM/create-root.sh
@@ -1,15 +1,6 @@
 #!/bin/sh
 
 trap 'poweroff -f' EXIT
-
-# don't let udev and this script step on eachother's toes
-for x in 64-lvm.rules 70-mdadm.rules 99-mount-rules; do
-    : > "/etc/udev/rules.d/$x"
-done
-rm -f -- /etc/lvm/lvm.conf
-udevadm control --reload
-udevadm settle
-
 set -ex
 for dev in /dev/disk/by-id/scsi-0QEMU_QEMU_HARDDISK_disk[123]; do
     lvm pvcreate -ff -y "$dev"

diff --git a/test/TEST-22-RAID-DEG/create-root.sh b/test/TEST-22-RAID-DEG/create-root.sh
index 2bf1754672df0c90107c97aa4c12da9130a7da67..4db5510eca1a41e79b4a87d58adf9b6b54261505 100755 (executable)
--- a/test/TEST-22-RAID-DEG/create-root.sh
+++ b/test/TEST-22-RAID-DEG/create-root.sh
@@ -1,14 +1,6 @@
 #!/bin/sh
 
 trap 'poweroff -f' EXIT
-
-# don't let udev and this script step on eachother's toes
-for x in 64-lvm.rules 70-mdadm.rules 99-mount-rules; do
-    : > "/etc/udev/rules.d/$x"
-done
-rm -f -- /etc/lvm/lvm.conf
-udevadm control --reload
-udevadm settle
 set -ex
 mdadm --create /dev/md0 --run --auto=yes --level=5 --raid-devices=3 /dev/disk/by-id/scsi-0QEMU_QEMU_HARDDISK_raid[123]
 # wait for the array to finish initializing, otherwise this sometimes fails

diff --git a/test/TEST-23-IMSM/create-root.sh b/test/TEST-23-IMSM/create-root.sh
index 62f4d98238d940f8174aa4259127b3ecb87a7ed5..f1c2573172437a31d852984f39ebc914b8e7c7a4 100755 (executable)
--- a/test/TEST-23-IMSM/create-root.sh
+++ b/test/TEST-23-IMSM/create-root.sh
@@ -2,15 +2,6 @@
 
 trap 'poweroff -f' EXIT
 
-# don't let udev and this script step on eachother's toes
-for x in 61-dmraid-imsm.rules 64-md-raid.rules 65-md-incremental-imsm.rules 65-md-incremental.rules 64-lvm.rules 70-mdadm.rules 99-mount-rules; do
-    rm -f -- "/etc/udev/rules.d/$x"
-done
-rm -f -- /etc/lvm/lvm.conf
-
-udevadm control --reload
-udevadm settle
-
 # dmraid does not want symlinks in --disk "..."
 echo y | dmraid -f isw -C Test0 --type 1 --disk "$(realpath /dev/disk/by-id/scsi-0QEMU_QEMU_HARDDISK_disk1) $(realpath /dev/disk/by-id/scsi-0QEMU_QEMU_HARDDISK_disk2)"
 udevadm settle

diff --git a/test/TEST-24-BTRFSRAID/create-root.sh b/test/TEST-24-BTRFSRAID/create-root.sh
index f416185a21b9b0328f32b7b2f38bd05112669c04..c7960e52a7039b225b162d94287a529d9b684b16 100755 (executable)
--- a/test/TEST-24-BTRFSRAID/create-root.sh
+++ b/test/TEST-24-BTRFSRAID/create-root.sh
@@ -1,15 +1,6 @@
 #!/bin/sh
 
 trap 'poweroff -f' EXIT
-
-# don't let udev and this script step on eachother's toes
-for x in 64-lvm.rules 70-mdadm.rules 99-mount-rules; do
-    : > "/etc/udev/rules.d/$x"
-done
-modprobe btrfs || :
-udevadm control --reload
-udevadm settle
-
 set -e
 
 mkfs.btrfs -q -draid10 -mraid10 -L root /dev/disk/by-id/scsi-0QEMU_QEMU_HARDDISK_raid[1234]

diff --git a/test/TEST-25-LVM-THIN/create-root.sh b/test/TEST-25-LVM-THIN/create-root.sh
index 1bf8202fa821b46773d079c741a805a5d4a265a4..538f2c8d0f1f6626ba3445558ec93cad25711661 100755 (executable)
--- a/test/TEST-25-LVM-THIN/create-root.sh
+++ b/test/TEST-25-LVM-THIN/create-root.sh
@@ -1,15 +1,6 @@
 #!/bin/sh
 
 trap 'poweroff -f' EXIT
-
-# don't let udev and this script step on eachother's toes
-for x in 64-lvm.rules 70-mdadm.rules 99-mount-rules; do
-    : > "/etc/udev/rules.d/$x"
-done
-rm -f -- /etc/lvm/lvm.conf
-udevadm control --reload
-udevadm settle
-
 set -ex
 modprobe dm_thin_pool
 for dev in /dev/disk/by-id/scsi-0QEMU_QEMU_HARDDISK_disk[123]; do

diff --git a/test/TEST-26-ENC-RAID-LVM/create-root.sh b/test/TEST-26-ENC-RAID-LVM/create-root.sh
index 7114fa05ab269a0dcb70fcb1b26281ae99aa10ab..d9aef6f468e6591fd61e8e5383f294dd9bdbc439 100755 (executable)
--- a/test/TEST-26-ENC-RAID-LVM/create-root.sh
+++ b/test/TEST-26-ENC-RAID-LVM/create-root.sh
@@ -1,16 +1,6 @@
 #!/bin/sh
 
 trap 'poweroff -f' EXIT
-
-# don't let udev and this script step on eachother's toes
-set -x
-for x in 64-lvm.rules 70-mdadm.rules 99-mount-rules; do
-    : > "/etc/udev/rules.d/$x"
-done
-rm -f -- /etc/lvm/lvm.conf
-udevadm control --reload
-udevadm settle
-
 set -ex
 printf test > keyfile
 cryptsetup -q luksFormat /dev/disk/by-id/scsi-0QEMU_QEMU_HARDDISK_disk1 /keyfile

diff --git a/test/TEST-30-DMSQUASH/create-root.sh b/test/TEST-30-DMSQUASH/create-root.sh
index 0477ad6143d319449c02276e94863c87c032d208..493f60b30c8e9ba7c47c6aaa118147310bfe9f43 100755 (executable)
--- a/test/TEST-30-DMSQUASH/create-root.sh
+++ b/test/TEST-30-DMSQUASH/create-root.sh
@@ -1,17 +1,8 @@
 #!/bin/sh
 
 trap 'poweroff -f' EXIT
-
-# don't let udev and this script step on eachother's toes
-for x in 64-lvm.rules 70-mdadm.rules 99-mount-rules; do
-    : > "/etc/udev/rules.d/$x"
-done
-rm -f -- /etc/lvm/lvm.conf
-udevadm control --reload
 set -e
 
-udevadm settle
-
 # create a single partition using 50% of the capacity of the image file created by test_setup() in test.sh
 sfdisk /dev/disk/by-id/scsi-0QEMU_QEMU_HARDDISK_root << EOF
 2048,161792

diff --git a/test/TEST-40-SYSTEMD/create-root.sh b/test/TEST-40-SYSTEMD/create-root.sh
index d443dd13cd10daded48c4e5d778db8ec57c096c7..236c7af94cd5a851f7db0406e9b77d131e1f05fa 100755 (executable)
--- a/test/TEST-40-SYSTEMD/create-root.sh
+++ b/test/TEST-40-SYSTEMD/create-root.sh
@@ -1,16 +1,8 @@
 #!/bin/sh
 
 trap 'poweroff -f' EXIT
-
-# don't let udev and this script step on eachother's toes
-for x in 64-lvm.rules 70-mdadm.rules 99-mount-rules; do
-    : > "/etc/udev/rules.d/$x"
-done
-rm -f -- /etc/lvm/lvm.conf
-udevadm control --reload
 set -e
 
-udevadm settle
 mkfs.ext4 -q -L '  rdinit=/bin/sh' /dev/disk/by-id/scsi-0QEMU_QEMU_HARDDISK_root
 mkdir -p /root
 mount -t ext4 /dev/disk/by-id/scsi-0QEMU_QEMU_HARDDISK_root /root

diff --git a/test/TEST-41-FULL-SYSTEMD/create-root.sh b/test/TEST-41-FULL-SYSTEMD/create-root.sh
index 0436c18ce254a49742f41d7cfa9ba3d07bf2a261..2d0d09829be61eb533b64a4ac72c872b58541210 100755 (executable)
--- a/test/TEST-41-FULL-SYSTEMD/create-root.sh
+++ b/test/TEST-41-FULL-SYSTEMD/create-root.sh
@@ -1,16 +1,8 @@
 #!/bin/sh
 
 trap 'poweroff -f' EXIT
-
-# don't let udev and this script step on eachother's toes
-for x in 64-lvm.rules 70-mdadm.rules 99-mount-rules; do
-    : > "/etc/udev/rules.d/$x"
-done
-rm -f -- /etc/lvm/lvm.conf
-udevadm control --reload
 set -e
 
-udevadm settle
 modprobe btrfs || :
 mkfs.btrfs -q -L dracut /dev/disk/by-id/scsi-0QEMU_QEMU_HARDDISK_root
 printf test > keyfile

diff --git a/test/TEST-42-SYSTEMD-INITRD/create-root.sh b/test/TEST-42-SYSTEMD-INITRD/create-root.sh
index 5f82ac36b3347da26d3f967874638719404f612a..1eda7c1bdaf9b895d5c7e5f3615fc1091ea38eb9 100755 (executable)
--- a/test/TEST-42-SYSTEMD-INITRD/create-root.sh
+++ b/test/TEST-42-SYSTEMD-INITRD/create-root.sh
@@ -1,16 +1,8 @@
 #!/bin/sh
 
 trap 'poweroff -f' EXIT
-
-# don't let udev and this script step on eachother's toes
-for x in 64-lvm.rules 70-mdadm.rules 99-mount-rules; do
-    : > "/etc/udev/rules.d/$x"
-done
-rm -f -- /etc/lvm/lvm.conf
-udevadm control --reload
 set -e
 
-udevadm settle
 mkfs.ext4 -q -L dracut /dev/disk/by-id/scsi-0QEMU_QEMU_HARDDISK_root
 mkdir -p /root
 mount -t ext4 /dev/disk/by-id/scsi-0QEMU_QEMU_HARDDISK_root /root

diff --git a/test/TEST-61-MULTINIC/create-root.sh b/test/TEST-61-MULTINIC/create-root.sh
index 051893762cf5307488a52ff69a3d0243f6d527ec..5d76b93e78fba065b00be44ec5c73539f382bf80 100755 (executable)
--- a/test/TEST-61-MULTINIC/create-root.sh
+++ b/test/TEST-61-MULTINIC/create-root.sh
@@ -1,15 +1,6 @@
 #!/bin/sh
 
 trap 'poweroff -f' EXIT
-
-# don't let udev and this script step on eachother's toes
-for x in 64-lvm.rules 70-mdadm.rules 99-mount-rules; do
-    : > "/etc/udev/rules.d/$x"
-done
-rm -f -- /etc/lvm/lvm.conf
-udevadm control --reload
-udevadm settle
-
 set -ex
 
 mkfs.ext4 -q -L dracut /dev/disk/by-id/scsi-0QEMU_QEMU_HARDDISK_root

diff --git a/test/TEST-62-BONDBRIDGEVLAN/create-root.sh b/test/TEST-62-BONDBRIDGEVLAN/create-root.sh
index 9164628e6ed95fa218f5baf69d65f2b22e49b602..b8dae2eb571adcaf5dd5f8b071aed5b9390f367e 100755 (executable)
--- a/test/TEST-62-BONDBRIDGEVLAN/create-root.sh
+++ b/test/TEST-62-BONDBRIDGEVLAN/create-root.sh
@@ -1,14 +1,6 @@
 #!/bin/sh
 
 trap 'poweroff -f' EXIT
-
-# don't let udev and this script step on eachother's toes
-for x in 64-lvm.rules 70-mdadm.rules 99-mount-rules; do
-    : > "/etc/udev/rules.d/$x"
-done
-rm -f -- /etc/lvm/lvm.conf
-udevadm control --reload
-udevadm settle
 set -e
 
 mkfs.ext4 -q -L dracut /dev/disk/by-id/scsi-0QEMU_QEMU_HARDDISK_root

diff --git a/test/TEST-70-ISCSI/create-client-root.sh b/test/TEST-70-ISCSI/create-client-root.sh
index 068cfcbe845c6647836f266bdb522a25eb8c73fe..1bbedfaeb136d4e0da6f381ffc6d7c48fe4dfc4a 100755 (executable)
--- a/test/TEST-70-ISCSI/create-client-root.sh
+++ b/test/TEST-70-ISCSI/create-client-root.sh
@@ -1,15 +1,6 @@
 #!/bin/sh
 
 trap 'poweroff -f' EXIT
-
-# don't let udev and this script step on eachother's toes
-for x in 64-lvm.rules 70-mdadm.rules 99-mount-rules; do
-    : > "/etc/udev/rules.d/$x"
-done
-rm -f -- /etc/lvm/lvm.conf
-udevadm control --reload
-udevadm settle
-
 set -ex
 
 mkfs.ext4 -q -j -L singleroot -F /dev/disk/by-id/scsi-0QEMU_QEMU_HARDDISK_singleroot

diff --git a/test/TEST-70-ISCSI/create-server-root.sh b/test/TEST-70-ISCSI/create-server-root.sh
index 004e79b60b88691170a2cf85b7b8d10b53d4a366..2621f17777b2d73babb6532568b7849c2dcaefe2 100755 (executable)
--- a/test/TEST-70-ISCSI/create-server-root.sh
+++ b/test/TEST-70-ISCSI/create-server-root.sh
@@ -1,15 +1,6 @@
 #!/bin/sh
 
 trap 'poweroff -f' EXIT
-
-# don't let udev and this script step on eachother's toes
-for x in 64-lvm.rules 70-mdadm.rules 99-mount-rules; do
-    : > "/etc/udev/rules.d/$x"
-done
-rm -f -- /etc/lvm/lvm.conf
-udevadm control --reload
-udevadm settle
-
 mkfs.ext4 -q -L dracut /dev/disk/by-id/scsi-0QEMU_QEMU_HARDDISK_root
 mkdir -p /root
 mount -t ext4 /dev/disk/by-id/scsi-0QEMU_QEMU_HARDDISK_root /root

diff --git a/test/TEST-71-ISCSI-MULTI/create-client-root.sh b/test/TEST-71-ISCSI-MULTI/create-client-root.sh
index 068cfcbe845c6647836f266bdb522a25eb8c73fe..1bbedfaeb136d4e0da6f381ffc6d7c48fe4dfc4a 100755 (executable)
--- a/test/TEST-71-ISCSI-MULTI/create-client-root.sh
+++ b/test/TEST-71-ISCSI-MULTI/create-client-root.sh
@@ -1,15 +1,6 @@
 #!/bin/sh
 
 trap 'poweroff -f' EXIT
-
-# don't let udev and this script step on eachother's toes
-for x in 64-lvm.rules 70-mdadm.rules 99-mount-rules; do
-    : > "/etc/udev/rules.d/$x"
-done
-rm -f -- /etc/lvm/lvm.conf
-udevadm control --reload
-udevadm settle
-
 set -ex
 
 mkfs.ext4 -q -j -L singleroot -F /dev/disk/by-id/scsi-0QEMU_QEMU_HARDDISK_singleroot

diff --git a/test/TEST-71-ISCSI-MULTI/create-server-root.sh b/test/TEST-71-ISCSI-MULTI/create-server-root.sh
index 004e79b60b88691170a2cf85b7b8d10b53d4a366..2621f17777b2d73babb6532568b7849c2dcaefe2 100755 (executable)
--- a/test/TEST-71-ISCSI-MULTI/create-server-root.sh
+++ b/test/TEST-71-ISCSI-MULTI/create-server-root.sh
@@ -1,15 +1,6 @@
 #!/bin/sh
 
 trap 'poweroff -f' EXIT
-
-# don't let udev and this script step on eachother's toes
-for x in 64-lvm.rules 70-mdadm.rules 99-mount-rules; do
-    : > "/etc/udev/rules.d/$x"
-done
-rm -f -- /etc/lvm/lvm.conf
-udevadm control --reload
-udevadm settle
-
 mkfs.ext4 -q -L dracut /dev/disk/by-id/scsi-0QEMU_QEMU_HARDDISK_root
 mkdir -p /root
 mount -t ext4 /dev/disk/by-id/scsi-0QEMU_QEMU_HARDDISK_root /root

diff --git a/test/TEST-72-NBD/create-client-root.sh b/test/TEST-72-NBD/create-client-root.sh
index a2114a81b898ba0105b5510a5daa6c46025d1906..dacb82f885a28f7f0618f5dd91e3a72c34ba9b31 100755 (executable)
--- a/test/TEST-72-NBD/create-client-root.sh
+++ b/test/TEST-72-NBD/create-client-root.sh
@@ -1,16 +1,8 @@
 #!/bin/sh
 
 trap 'poweroff -f' EXIT
-
-# don't let udev and this script step on eachother's toes
-for x in 64-lvm.rules 70-mdadm.rules 99-mount-rules; do
-    : > "/etc/udev/rules.d/$x"
-done
-rm -f -- /etc/lvm/lvm.conf
-udevadm control --reload
 set -e
 
-udevadm settle
 mkfs.ext4 -q -L dracut /dev/disk/by-id/scsi-0QEMU_QEMU_HARDDISK_root
 mkdir -p /root
 mount -t ext4 /dev/disk/by-id/scsi-0QEMU_QEMU_HARDDISK_root /root

diff --git a/test/TEST-72-NBD/create-encrypted-root.sh b/test/TEST-72-NBD/create-encrypted-root.sh
index 3e5dbf1ed471edb0012b3ca6a600d9d38aed6717..75c0189ef985fda8c7c5433966c4680829e1dfd5 100755 (executable)
--- a/test/TEST-72-NBD/create-encrypted-root.sh
+++ b/test/TEST-72-NBD/create-encrypted-root.sh
@@ -1,15 +1,6 @@
 #!/bin/sh
 
 trap 'poweroff -f' EXIT
-
-# don't let udev and this script step on eachother's toes
-for x in 64-lvm.rules 70-mdadm.rules 99-mount-rules; do
-    : > "/etc/udev/rules.d/$x"
-done
-rm -f -- /etc/lvm/lvm.conf
-udevadm control --reload
-udevadm settle
-
 set -ex
 
 printf test > keyfile

diff --git a/test/TEST-72-NBD/create-server-root.sh b/test/TEST-72-NBD/create-server-root.sh
index d0c5c3061acc75c28f8a7f50d3395d879871473f..75208b248ed046817571bfbcd05189bbbdba8a6e 100755 (executable)
--- a/test/TEST-72-NBD/create-server-root.sh
+++ b/test/TEST-72-NBD/create-server-root.sh
@@ -1,17 +1,8 @@
 #!/bin/sh
 
 trap 'poweroff -f' EXIT
-
-# don't let udev and this script step on eachother's toes
-for x in 64-lvm.rules 70-mdadm.rules 99-mount-rules; do
-    : > "/etc/udev/rules.d/$x"
-done
-rm -f -- /etc/lvm/lvm.conf
-udevadm control --reload
-udevadm settle
 set -e
 
-udevadm settle
 mkfs.ext4 -q -L dracut /dev/disk/by-id/scsi-0QEMU_QEMU_HARDDISK_root
 mkdir -p /root
 mount -t ext4 /dev/disk/by-id/scsi-0QEMU_QEMU_HARDDISK_root /root