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 4f3538dc7a3ffacfe91842a134f3ae6253ead62e..04b1b6799f3dcaddf3c7e3e532826af38f9291fd 100755 (executable)
--- 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 2ef2208bd067078296f864e131bb1d3fde13923e..2a7d51f27fa6f0a6efc7d734d59b953df513c253 100755 (executable)
--- 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 f581d1e1b888ab3f4f02c2085331c6d47a073324..9a160df034904804d77c5ecc215adc30fce06fb1 100755 (executable)
--- 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 841bdf36371eb0b5fb2f67e4a301f4b516769907..13bfdcd0f92ceb6cce0741762ac0915d64584e31 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() {
     # 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 963c12fdb8bcae06f7165f425710d0e8b97f7243..8e1782b1d6002d10effd0ae42743eba1ad0d774b 100755 (executable)
--- 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 9c5d4f0483c688c4f33229c4477ae9e5846e0491..0d477710da89059ca9c788ec73f1760ede30c39c 100755 (executable)
--- 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 \