]> git.ipfire.org Git - thirdparty/dracut-ng.git/commitdiff
projects / thirdparty / dracut-ng.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: f5b04cf)
test: remove unnecessary intermediate cleanups
authorJo Zzsi <jozzsicsataban@gmail.com>
Sun, 15 Sep 2024 00:07:34 +0000 (20:07 -0400)
committerLaszlo Gombos <laszlo.gombos@gmail.com>
Thu, 19 Sep 2024 18:46:14 +0000 (14:46 -0400)
16 files changed:
test/TEST-01-BASIC/test.sh patch | blob | blame | history
test/TEST-02-SYSTEMD/test.sh patch | blob | blame | history
test/TEST-03-USR-MOUNT/test.sh patch | blob | blame | history
test/TEST-04-FULL-SYSTEMD/test.sh patch | blob | blame | history
test/TEST-05-SYSTEMD-INITRD/test.sh patch | blob | blame | history
test/TEST-10-RAID/test.sh patch | blob | blame | history
test/TEST-11-LVM/test.sh patch | blob | blame | history
test/TEST-12-RAID-DEG/test.sh patch | blob | blame | history
test/TEST-13-ENC-RAID-LVM/test.sh patch | blob | blame | history
test/TEST-14-IMSM/test.sh patch | blob | blame | history
test/TEST-15-BTRFSRAID/test.sh patch | blob | blame | history
test/TEST-16-DMSQUASH/test.sh patch | blob | blame | history
test/TEST-17-LVM-THIN/test.sh patch | blob | blame | history
test/TEST-20-NFS/test.sh patch | blob | blame | history
test/TEST-35-ISCSI-MULTI/test.sh patch | blob | blame | history
test/TEST-40-NBD/test.sh patch | blob | blame | history

diff --git a/test/TEST-01-BASIC/test.sh b/test/TEST-01-BASIC/test.sh
index 99f0c8ee6fb15f7406d982a48b403c5b2c89f2fd..2b0e926e74256041087dbc20a01d4dd8c18aad2d 100755 (executable)
--- a/test/TEST-01-BASIC/test.sh
+++ b/test/TEST-01-BASIC/test.sh
@@ -39,7 +39,6 @@ test_setup() {
         -I "mkfs.${TEST_FSTYPE}" \
         -i ./create-root.sh /lib/dracut/hooks/initqueue/01-create-root.sh \
         -f "$TESTDIR"/initramfs.makeroot "$KVERSION" || return 1
-    rm -rf -- "$TESTDIR"/overlay
 
     declare -a disk_args=()
     declare -i disk_index=0
diff --git a/test/TEST-02-SYSTEMD/test.sh b/test/TEST-02-SYSTEMD/test.sh
index 2ff5779631e8ac4ac11c0f5de72a44be78e03290..5f67b1123edeee0e7eb9ff14cfb9754597edb09e 100755 (executable)
--- a/test/TEST-02-SYSTEMD/test.sh
+++ b/test/TEST-02-SYSTEMD/test.sh
@@ -40,7 +40,6 @@ test_setup() {
         --nomdadmconf \
         --no-hostonly-cmdline -N \
         -f "$TESTDIR"/initramfs.makeroot "$KVERSION" || return 1
-    rm -rf -- "$TESTDIR"/overlay
 
     declare -a disk_args=()
     declare -i disk_index=0
diff --git a/test/TEST-03-USR-MOUNT/test.sh b/test/TEST-03-USR-MOUNT/test.sh
index 48ecd514d08129c127fc82c2f101a05a39e1bf68..fd00e7cb213191d3ec33c8f7d39d83fd8db634ea 100755 (executable)
--- a/test/TEST-03-USR-MOUNT/test.sh
+++ b/test/TEST-03-USR-MOUNT/test.sh
@@ -55,7 +55,6 @@ test_setup() {
         -I "mkfs.btrfs" \
         -i ./create-root.sh /lib/dracut/hooks/initqueue/01-create-root.sh \
         -f "$TESTDIR"/initramfs.makeroot "$KVERSION" || return 1
-    rm -rf -- "$TESTDIR"/overlay
 
     # Create the blank file to use as a root filesystem
     declare -a disk_args=()
@@ -78,7 +77,6 @@ test_setup() {
     test_dracut \
         -d "btrfs" \
         "$TESTDIR"/initramfs.testing
-    rm -rf -- "$TESTDIR"/overlay
 }
 
 # shellcheck disable=SC1090
diff --git a/test/TEST-04-FULL-SYSTEMD/test.sh b/test/TEST-04-FULL-SYSTEMD/test.sh
index 8ca103379f37bdb69e00a3f4101ada388352e01f..c2bff2882766a4a6dfecc4295a38772741f4f0c7 100755 (executable)
--- a/test/TEST-04-FULL-SYSTEMD/test.sh
+++ b/test/TEST-04-FULL-SYSTEMD/test.sh
@@ -107,7 +107,6 @@ EOF
         -I "mkfs.btrfs cryptsetup" \
         -i ./create-root.sh /lib/dracut/hooks/initqueue/01-create-root.sh \
         -f "$TESTDIR"/initramfs.makeroot "$KVERSION" || return 1
-    rm -rf -- "$TESTDIR"/overlay/*
 
     # Create the blank file to use as a root filesystem
     declare -a disk_args=()
@@ -133,8 +132,6 @@ EOF
         --add-drivers "btrfs" \
         -i "/tmp/key" "/etc/key" \
         "$TESTDIR"/initramfs.testing
-
-    rm -rf -- "$TESTDIR"/overlay
 }
 
 # shellcheck disable=SC1090
diff --git a/test/TEST-05-SYSTEMD-INITRD/test.sh b/test/TEST-05-SYSTEMD-INITRD/test.sh
index 10b24d211c962e44169593e5ea2769adf4fbe8ed..57ab5ec1207e31f05884ea991b575e3916fdb769 100755 (executable)
--- a/test/TEST-05-SYSTEMD-INITRD/test.sh
+++ b/test/TEST-05-SYSTEMD-INITRD/test.sh
@@ -60,7 +60,6 @@ test_setup() {
         --nomdadmconf \
         --no-hostonly-cmdline -N \
         -f "$TESTDIR"/initramfs.makeroot "$KVERSION" || return 1
-    rm -rf -- "$TESTDIR"/overlay
 
     declare -a disk_args=()
     declare -i disk_index=0
diff --git a/test/TEST-10-RAID/test.sh b/test/TEST-10-RAID/test.sh
index 2dfac51f52d49bf57cd05b3586bfaae10e1b7c84..b82cb9b950ce0d4f7730d823aef83b5d8385e906 100755 (executable)
--- a/test/TEST-10-RAID/test.sh
+++ b/test/TEST-10-RAID/test.sh
@@ -38,7 +38,6 @@ test_setup() {
         -I "grep cryptsetup" \
         -i ./create-root.sh /lib/dracut/hooks/initqueue/01-create-root.sh \
         -f "$TESTDIR"/initramfs.makeroot "$KVERSION" || return 1
-    rm -rf -- "$TESTDIR"/overlay
 
     # Create the blank files to use as a root filesystem
     declare -a disk_args=()
diff --git a/test/TEST-11-LVM/test.sh b/test/TEST-11-LVM/test.sh
index de531dd28ea12b302ac3745fd99a0de9baf56125..6977ba42e17096af2ff48cc2ba06d8bb74a2bfb4 100755 (executable)
--- a/test/TEST-11-LVM/test.sh
+++ b/test/TEST-11-LVM/test.sh
@@ -39,7 +39,6 @@ test_setup() {
         -a "bash lvm mdraid" \
         -i ./create-root.sh /lib/dracut/hooks/initqueue/01-create-root.sh \
         -f "$TESTDIR"/initramfs.makeroot "$KVERSION" || return 1
-    rm -rf -- "$TESTDIR"/overlay
 
     # Create the blank files to use as a root filesystem
     declare -a disk_args=()
diff --git a/test/TEST-12-RAID-DEG/test.sh b/test/TEST-12-RAID-DEG/test.sh
index 349a915bd7eb044a7488780a80cd96c3b7a408e0..7170215d76609a02addf17bc8445a47b1648ec58 100755 (executable)
--- a/test/TEST-12-RAID-DEG/test.sh
+++ b/test/TEST-12-RAID-DEG/test.sh
@@ -70,7 +70,6 @@ test_setup() {
         -I "grep cryptsetup" \
         -i ./create-root.sh /lib/dracut/hooks/initqueue/01-create-root.sh \
         -f "$TESTDIR"/initramfs.makeroot "$KVERSION" || return 1
-    rm -rf -- "$TESTDIR"/overlay
 
     # Create the blank files to use as a root filesystem
     declare -a disk_args=()
diff --git a/test/TEST-13-ENC-RAID-LVM/test.sh b/test/TEST-13-ENC-RAID-LVM/test.sh
index ab9ba68f4098b241be3721ac26a9d49c934fa8e8..4211ef97920c67012c663068381be02d02fd6ae6 100755 (executable)
--- a/test/TEST-13-ENC-RAID-LVM/test.sh
+++ b/test/TEST-13-ENC-RAID-LVM/test.sh
@@ -68,7 +68,6 @@ test_setup() {
         -I "grep cryptsetup" \
         -i ./create-root.sh /lib/dracut/hooks/initqueue/01-create-root.sh \
         -f "$TESTDIR"/initramfs.makeroot "$KVERSION" || return 1
-    rm -rf -- "$TESTDIR"/overlay
 
     # Create the blank files to use as a root filesystem
     declare -a disk_args=()
diff --git a/test/TEST-14-IMSM/test.sh b/test/TEST-14-IMSM/test.sh
index ec4a4cc19998b6a0412e652d2d89a6f37884dc9c..a866cc90beb5d32a201e3cb8778a0fa8a4206fb7 100755 (executable)
--- a/test/TEST-14-IMSM/test.sh
+++ b/test/TEST-14-IMSM/test.sh
@@ -70,7 +70,6 @@ test_setup() {
         -I "grep sfdisk realpath" \
         -i ./create-root.sh /lib/dracut/hooks/initqueue/01-create-root.sh \
         -f "$TESTDIR"/initramfs.makeroot "$KVERSION" || return 1
-    rm -rf -- "$TESTDIR"/overlay
 
     # Create the blank files to use as a root filesystem
     declare -a disk_args=()
diff --git a/test/TEST-15-BTRFSRAID/test.sh b/test/TEST-15-BTRFSRAID/test.sh
index 49c1c6d2b2c536d4971ef0fcf27ceb7faaf6b12b..bfed8dd5900a20130741eaf2d6fc5a58fe59bfeb 100755 (executable)
--- a/test/TEST-15-BTRFSRAID/test.sh
+++ b/test/TEST-15-BTRFSRAID/test.sh
@@ -45,8 +45,6 @@ test_setup() {
         -i ./create-root.sh /lib/dracut/hooks/initqueue/01-create-root.sh \
         -f "$TESTDIR"/initramfs.makeroot "$KVERSION" || return 1
 
-    rm -rf -- "$TESTDIR"/overlay
-
     # Create the blank files to use as a root filesystem
     declare -a disk_args=()
     # shellcheck disable=SC2034
diff --git a/test/TEST-16-DMSQUASH/test.sh b/test/TEST-16-DMSQUASH/test.sh
index 0e0a1fab3a50b55229abcf5c8e080925dcafec8b..c77d3fb8eb3afc896e4a5fa72aa27bc63b17c84c 100755 (executable)
--- a/test/TEST-16-DMSQUASH/test.sh
+++ b/test/TEST-16-DMSQUASH/test.sh
@@ -113,7 +113,6 @@ test_setup() {
         --drivers "ntfs3 erofs" \
         --include ./create-root.sh /lib/dracut/hooks/initqueue/01-create-root.sh \
         --force "$TESTDIR"/initramfs.makeroot "$KVERSION" || return 1
-    rm -rf -- "$TESTDIR"/overlay
 
     # Create the blank file to use as a root filesystem
     declare -a disk_args=()
@@ -163,8 +162,6 @@ EOF
         --omit "systemd" \
         --install "mkfs.ext4" \
         "$TESTDIR"/initramfs.testing-autooverlay
-
-    rm -rf -- "$TESTDIR"/overlay
 }
 
 # shellcheck disable=SC1090
diff --git a/test/TEST-17-LVM-THIN/test.sh b/test/TEST-17-LVM-THIN/test.sh
index cf26974d045ea8fd5c0e78ee7fb9244b1c55757a..bc75e7045ef18a0da726e0c0656b9f935b1408e3 100755 (executable)
--- a/test/TEST-17-LVM-THIN/test.sh
+++ b/test/TEST-17-LVM-THIN/test.sh
@@ -40,7 +40,6 @@ test_setup() {
         -I "grep" \
         -i ./create-root.sh /lib/dracut/hooks/initqueue/01-create-root.sh \
         -f "$TESTDIR"/initramfs.makeroot "$KVERSION" || return 1
-    rm -rf -- "$TESTDIR"/overlay
 
     # Create the blank files to use as a root filesystem
     declare -a disk_args=()
diff --git a/test/TEST-20-NFS/test.sh b/test/TEST-20-NFS/test.sh
index ad4b9afa9314447fa96c9630aad2877ff7122ecf..9d1bef0046490a3dc129065ce5a0ef8994a104af 100755 (executable)
--- a/test/TEST-20-NFS/test.sh
+++ b/test/TEST-20-NFS/test.sh
@@ -420,8 +420,6 @@ test_setup() {
         -d "af_packet piix ide-gd_mod ata_piix ext4 sd_mod e1000 i6300esb" \
         --no-hostonly-cmdline -N \
         -f "$TESTDIR"/initramfs.server "$KVERSION" || return 1
-
-    rm -rf -- "$TESTDIR"/overlay
 }
 
 test_cleanup() {
diff --git a/test/TEST-35-ISCSI-MULTI/test.sh b/test/TEST-35-ISCSI-MULTI/test.sh
index 6849931bd9f0020d221871d2aa04be749e274b67..9e950c3558f18058505f38ba1cfa839aee6ecdbc 100755 (executable)
--- a/test/TEST-35-ISCSI-MULTI/test.sh
+++ b/test/TEST-35-ISCSI-MULTI/test.sh
@@ -237,8 +237,6 @@ test_setup() {
         -i "./wait-if-server.sh" "/lib/dracut/hooks/pre-mount/99-wait-if-server.sh" \
         --no-hostonly-cmdline -N \
         -f "$TESTDIR"/initramfs.server "$KVERSION" || return 1
-
-    rm -rf -- "$TESTDIR"/overlay
 }
 
 test_cleanup() {
diff --git a/test/TEST-40-NBD/test.sh b/test/TEST-40-NBD/test.sh
index b1ae466ae92bde9da3f8dc57ed88d80c7a31f8e0..9f11c9954137ed7ef52649c4ddb27c662367e415 100755 (executable)
--- a/test/TEST-40-NBD/test.sh
+++ b/test/TEST-40-NBD/test.sh
@@ -343,8 +343,6 @@ test_setup() {
         -i "./server.link" "/etc/systemd/network/01-server.link" \
         -i "./wait-if-server.sh" "/lib/dracut/hooks/pre-mount/99-wait-if-server.sh" \
         -f "$TESTDIR"/initramfs.server "$KVERSION" || return 1
-
-    rm -rf -- "$TESTDIR"/overlay
 }
 
 kill_server() {
Mirror of https://github.com/dracut-ng/dracut-ng.git