test: prevent overlay/source being added in test_dracut

The function `test_dracut()` will include `$TESTDIR/overlay` into the
test `initramfs.testing` if available. Several tests create
`$TESTDIR/overlay/source` for creating rootfs using `test-makeroot`.

Delete `$TESTDIR/overlay` after being used by `test-makeroot` to avoid
adding `$TESTDIR/overlay/source` to the client test initrd.

diff --git a/test/TEST-11-USR-MOUNT/test.sh b/test/TEST-11-USR-MOUNT/test.sh
index 0a232fcfba10678bfb8f7b9510501e3a2947c03d..544573247bbda19d50711d08359b1ab4090801ff 100755 (executable)
--- a/test/TEST-11-USR-MOUNT/test.sh
+++ b/test/TEST-11-USR-MOUNT/test.sh
@@ -66,6 +66,7 @@ test_setup() {
         "${disk_args[@]}" \
         -append "root=/dev/dracut/root quiet" \
         -initrd "$TESTDIR"/initramfs.makeroot
+    rm -rf "$TESTDIR"/overlay
 
     if ! test_marker_check dracut-root-block-created; then
         echo "Could not create root filesystem"

diff --git a/test/TEST-20-STORAGE/test.sh b/test/TEST-20-STORAGE/test.sh
index 551cfc329c6dcb1f3e6a919a43e63bcd89a61a0f..7b9c4e6e861e77bee871795299535c8df6532762 100755 (executable)
--- a/test/TEST-20-STORAGE/test.sh
+++ b/test/TEST-20-STORAGE/test.sh
@@ -156,6 +156,8 @@ test_setup() {
         chmod 0600 /tmp/key
     fi
 
+    rm -rf "$TESTDIR"/overlay
+
     # shellcheck disable=SC2046
     test_dracut \
         -a "lvm" \

diff --git a/test/TEST-26-ENC-RAID-LVM/test.sh b/test/TEST-26-ENC-RAID-LVM/test.sh
index 657be912bd81f489b5931a76d4484931e58d0723..642ce5d98f50d5a579a862570de0da54462040fd 100755 (executable)
--- a/test/TEST-26-ENC-RAID-LVM/test.sh
+++ b/test/TEST-26-ENC-RAID-LVM/test.sh
@@ -72,6 +72,7 @@ test_setup() {
         -append "root=/dev/fakeroot quiet" \
         -initrd "$TESTDIR"/initramfs.makeroot
     test_marker_check dracut-root-block-created
+    rm -rf "$TESTDIR"/overlay
     cryptoUUIDS=$(grep -F -a -m 3 ID_FS_UUID "$TESTDIR"/marker.img)
     for uuid in $cryptoUUIDS; do
         eval "$uuid"

diff --git a/test/TEST-41-FULL-SYSTEMD/test.sh b/test/TEST-41-FULL-SYSTEMD/test.sh
index f5751e0b9479814d4b843f5bf3bde199bba2304d..0f45dd6529cecc8738500636ebc62e9b339a3943 100755 (executable)
--- a/test/TEST-41-FULL-SYSTEMD/test.sh
+++ b/test/TEST-41-FULL-SYSTEMD/test.sh
@@ -88,6 +88,7 @@ test_setup() {
         -I "mkfs.btrfs cryptsetup" \
         -i ./create-root.sh /usr/lib/dracut/hooks/initqueue/01-create-root.sh \
         -f "$TESTDIR"/initramfs.makeroot
+    rm -rf "$TESTDIR"/overlay
 
     KVERSION=$(determine_kernel_version "$TESTDIR"/initramfs.makeroot)
 

diff --git a/test/TEST-44-DRIVERS/test.sh b/test/TEST-44-DRIVERS/test.sh
index da604c796407f6c4005a6231aba26c2c2bea18a1..a6d4b2dbdb9d84abdbf8c7881c63da64c4f486d3 100755 (executable)
--- a/test/TEST-44-DRIVERS/test.sh
+++ b/test/TEST-44-DRIVERS/test.sh
@@ -49,6 +49,7 @@ test_setup() {
     mkdir -p "$TESTDIR"/overlay/source/lib/modules "$TESTDIR"/overlay/source/mnt
 
     build_ext4_image "$TESTDIR/overlay/source" "$TESTDIR"/root.img dracut
+    rm -rf "$TESTDIR"/overlay
 
     rm -f "$TESTDIR/mnt.img"
     truncate -s 512M "$TESTDIR/mnt.img"

diff --git a/test/TEST-70-ISCSI/test.sh b/test/TEST-70-ISCSI/test.sh
index b960be3679cf7c3b3b813a457926ca1964b99852..4b6e20b9a2eb52fa7f2c4da129ff8da4c1849c56 100755 (executable)
--- a/test/TEST-70-ISCSI/test.sh
+++ b/test/TEST-70-ISCSI/test.sh
@@ -171,6 +171,7 @@ test_setup() {
     inst_init ./server-init.sh "$TESTDIR"/overlay/source
 
     build_ext4_image "$TESTDIR/overlay/source" "$TESTDIR"/server.img dracut
+    rm -rf "$TESTDIR"/overlay
 
     # Make server's dracut image
     call_dracut \

diff --git a/test/TEST-71-ISCSI-MULTI/test.sh b/test/TEST-71-ISCSI-MULTI/test.sh
index a83fdad79a2017668e7b92991ac91504c62b6012..099fd994352011da07b8f3cbe740402075976181 100755 (executable)
--- a/test/TEST-71-ISCSI-MULTI/test.sh
+++ b/test/TEST-71-ISCSI-MULTI/test.sh
@@ -182,6 +182,7 @@ test_setup() {
     inst_init ./server-init.sh "$TESTDIR"/overlay/source
 
     build_ext4_image "$TESTDIR/overlay/source" "$TESTDIR"/server.img dracut
+    rm -rf "$TESTDIR"/overlay
 
     # Make client's dracut image
     test_dracut \