test: move more makeroot dependencies into test-makeroot dracut module

Author: Henrik66

modules.d/80test-makeroot/module-setup.sh

@@ -6,7 +6,11 @@ check() {
 }
 
 depends() {
-    echo "qemu"
+    echo "dash rootfs-block kernel-modules qemu"
+}
+
+installkernel() {
+    instmods piix ide-gd_mod ata_piix ext4 sd_mod
 }
 
 install() {

test/TEST-01-BASIC/test.sh

@@ -37,8 +37,7 @@ test_setup() {
     # We do it this way so that we do not risk trashing the host mdraid
     # devices, volume groups, encrypted partitions, etc.
     "$basedir"/dracut.sh -l -i "$TESTDIR"/overlay / \
-        -m "test-makeroot dash rootfs-block kernel-modules" \
-        -d "piix ide-gd_mod ata_piix ext4 sd_mod" \
+        -m "test-makeroot" \
         -I "mkfs.ext4" \
         -i ./create-root.sh /lib/dracut/hooks/initqueue/01-create-root.sh \
         --nomdadmconf \

test/TEST-02-SYSTEMD/test.sh

@@ -39,8 +39,7 @@ test_setup() {
     # We do it this way so that we do not risk trashing the host mdraid
     # devices, volume groups, encrypted partitions, etc.
     "$basedir"/dracut.sh -l -i "$TESTDIR"/overlay / \
-        -m "test-makeroot dash rootfs-block kernel-modules qemu" \
-        -d "piix ide-gd_mod ata_piix ext4 sd_mod" \
+        -m "test-makeroot" \
         -I "mkfs.ext4" \
         -i ./create-root.sh /lib/dracut/hooks/initqueue/01-create-root.sh \
         --nomdadmconf \

test/TEST-03-USR-MOUNT/test.sh

@@ -56,8 +56,7 @@ test_setup() {
     # We do it this way so that we do not risk trashing the host mdraid
     # devices, volume groups, encrypted partitions, etc.
     "$basedir"/dracut.sh -l -i "$TESTDIR"/overlay / \
-        -m "test-makeroot dash btrfs rootfs-block kernel-modules" \
-        -d "piix ide-gd_mod ata_piix btrfs sd_mod" \
+        -m "test-makeroot" \
         -I "mkfs.btrfs" \
         -i ./create-root.sh /lib/dracut/hooks/initqueue/01-create-root.sh \
         --nomdadmconf \

test/TEST-04-FULL-SYSTEMD/test.sh

@@ -117,9 +117,8 @@ EOF
     # We do it this way so that we do not risk trashing the host mdraid
     # devices, volume groups, encrypted partitions, etc.
     "$basedir"/dracut.sh -l -i "$TESTDIR"/overlay / \
-        -m "test-makeroot bash btrfs rootfs-block kernel-modules qemu" \
-        -d "piix ide-gd_mod ata_piix btrfs sd_mod" \
-        -I "mkfs.btrfs btrfs sync" \
+        -m "test-makeroot bash btrfs" \
+        -I "mkfs.btrfs" \
         -i ./create-root.sh /lib/dracut/hooks/initqueue/01-create-root.sh \
         --nomdadmconf \
         --nohardlink \

test/TEST-16-DMSQUASH/test.sh

@@ -71,8 +71,7 @@ test_setup() {
     # We do it this way so that we do not risk trashing the host mdraid
     # devices, volume groups, encrypted partitions, etc.
     "$basedir"/dracut.sh -l -i "$TESTDIR"/overlay / \
-        --modules "test-makeroot rootfs-block qemu" \
-        --drivers "ext4 sd_mod" \
+        --modules "test-makeroot" \
         --install "sfdisk mkfs.ext4 mksquashfs" \
         --include ./create-root.sh /lib/dracut/hooks/initqueue/01-create-root.sh \
         --no-hostonly --no-hostonly-cmdline --no-early-microcode --nofscks --nomdadmconf --nohardlink --nostrip \