From: Laszlo Gombos <laszlo.gombos@gmail.com>
Date: Tue, 23 Apr 2024 02:03:40 +0000 (-0400)
Subject: test: do not double-include drivers from test-makeroot
X-Git-Tag: 102~98
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=93ead0a72bf416dbb79cbf171c8bb7abc3be9b12;p=thirdparty%2Fdracut-ng.git

test: do not double-include drivers from test-makeroot
---

diff --git a/test/TEST-10-RAID/test.sh b/test/TEST-10-RAID/test.sh
index 4f3538dc7..04b1b6799 100755
--- a/test/TEST-10-RAID/test.sh
+++ b/test/TEST-10-RAID/test.sh
@@ -38,7 +38,6 @@ test_setup() {
     # devices, volume groups, encrypted partitions, etc.
     "$DRACUT" -l -i "$TESTDIR"/overlay / \
         -m "test-makeroot bash crypt lvm mdraid kernel-modules" \
-        -d "piix ide-gd_mod ata_piix ext4 sd_mod" \
         --nomdadmconf \
         -I "mkfs.ext4 grep" \
         -i ./create-root.sh /lib/dracut/hooks/initqueue/01-create-root.sh \
diff --git a/test/TEST-11-LVM/test.sh b/test/TEST-11-LVM/test.sh
index 2ef2208bd..2a7d51f27 100755
--- a/test/TEST-11-LVM/test.sh
+++ b/test/TEST-11-LVM/test.sh
@@ -40,7 +40,6 @@ test_setup() {
     # devices, volume groups, encrypted partitions, etc.
     "$DRACUT" -l -i "$TESTDIR"/overlay / \
         -m "test-makeroot bash lvm mdraid kernel-modules" \
-        -d "piix ide-gd_mod ata_piix ext4 sd_mod" \
         -I "mkfs.ext4" \
         -i ./create-root.sh /lib/dracut/hooks/initqueue/01-create-root.sh \
         --no-hostonly-cmdline -N \
diff --git a/test/TEST-12-RAID-DEG/test.sh b/test/TEST-12-RAID-DEG/test.sh
index f581d1e1b..9a160df03 100755
--- a/test/TEST-12-RAID-DEG/test.sh
+++ b/test/TEST-12-RAID-DEG/test.sh
@@ -70,7 +70,6 @@ test_setup() {
     # devices, volume groups, encrypted partitions, etc.
     "$DRACUT" -l -i "$TESTDIR"/overlay / \
         -m "test-makeroot bash crypt lvm mdraid kernel-modules" \
-        -d "piix ide-gd_mod ata_piix ext4 sd_mod" \
         -I "mkfs.ext4 grep sfdisk" \
         -i ./create-root.sh /lib/dracut/hooks/initqueue/01-create-root.sh \
         --no-hostonly-cmdline -N \
diff --git a/test/TEST-13-ENC-RAID-LVM/test.sh b/test/TEST-13-ENC-RAID-LVM/test.sh
index 841bdf363..13bfdcd0f 100755
--- a/test/TEST-13-ENC-RAID-LVM/test.sh
+++ b/test/TEST-13-ENC-RAID-LVM/test.sh
@@ -68,7 +68,6 @@ test_setup() {
     # devices, volume groups, encrypted partitions, etc.
     "$DRACUT" -l -i "$TESTDIR"/overlay / \
         -m "test-makeroot bash crypt lvm mdraid kernel-modules" \
-        -d "piix ide-gd_mod ata_piix ext4 sd_mod" \
         -I "mkfs.ext4 grep" \
         -i ./create-root.sh /lib/dracut/hooks/initqueue/01-create-root.sh \
         --no-hostonly-cmdline -N \
diff --git a/test/TEST-17-LVM-THIN/test.sh b/test/TEST-17-LVM-THIN/test.sh
index 963c12fdb..8e1782b1d 100755
--- a/test/TEST-17-LVM-THIN/test.sh
+++ b/test/TEST-17-LVM-THIN/test.sh
@@ -40,7 +40,6 @@ test_setup() {
     # devices, volume groups, encrypted partitions, etc.
     "$DRACUT" -l -i "$TESTDIR"/overlay / \
         -m "test-makeroot bash lvm mdraid kernel-modules" \
-        -d "piix ide-gd_mod ata_piix ext4 sd_mod" \
         -I "mkfs.ext4 grep" \
         -i ./create-root.sh /lib/dracut/hooks/initqueue/01-create-root.sh \
         --no-hostonly-cmdline -N \
diff --git a/test/TEST-40-NBD/test.sh b/test/TEST-40-NBD/test.sh
index 9c5d4f048..0d477710d 100755
--- a/test/TEST-40-NBD/test.sh
+++ b/test/TEST-40-NBD/test.sh
@@ -204,7 +204,6 @@ make_encrypted_root() {
     # devices, volume groups, encrypted partitions, etc.
     "$DRACUT" -l -i "$TESTDIR"/overlay / \
         -m "test-makeroot" \
-        -d "piix ide-gd_mod ata_piix ext4 sd_mod" \
         -i ./create-server-root.sh /lib/dracut/hooks/initqueue/01-create-encrypted-root.sh \
         -I "mkfs.ext4" \
         --no-hostonly-cmdline -N \
@@ -243,7 +242,6 @@ make_client_root() {
     # devices, volume groups, encrypted partitions, etc.
     "$DRACUT" -l -i "$TESTDIR"/overlay / \
         -m "test-makeroot" \
-        -d "piix ide-gd_mod ata_piix ext4 sd_mod" \
         -I "mkfs.ext4" \
         -i ./create-client-root.sh /lib/dracut/hooks/initqueue/01-create-client-root.sh \
         --nomdadmconf \
@@ -302,7 +300,6 @@ EOF
     # devices, volume groups, encrypted partitions, etc.
     "$DRACUT" -l -i "$TESTDIR"/overlay / \
         -m "test-makeroot" \
-        -d "piix ide-gd_mod ata_piix ext4 sd_mod" \
         -i ./create-server-root.sh /lib/dracut/hooks/initqueue/01-create-server-root.sh \
         -I "mkfs.ext4" \
         --nomdadmconf \