test: update all tests to build initrd with test_dracut

diff --git a/modules.d/80test/module-setup.sh b/modules.d/80test/module-setup.sh
index c51d76abfa66f3b3c9714b3d8ed7354ee32f059b..9c48a81e7d54465f87ed3ad45561ade2377bac48 100755 (executable)
--- a/modules.d/80test/module-setup.sh
+++ b/modules.d/80test/module-setup.sh
@@ -11,6 +11,11 @@ depends() {
 
 installkernel() {
     instmods \
+        ata_piix \
+        ext4 \
+        i6300esb \
+        ide-gd_mod \
+        piix \
         sd_mod \
         virtio_pci \
         virtio_scsi

diff --git a/test/TEST-01-BASIC/test.sh b/test/TEST-01-BASIC/test.sh
index e041c326461aa4f59b0347e9ebed4a7e05eaf446..ce834dc438cdfc3555ea9974f175524bbbabee39 100755 (executable)
--- a/test/TEST-01-BASIC/test.sh
+++ b/test/TEST-01-BASIC/test.sh
@@ -15,7 +15,7 @@ test_run() {
     "$testdir"/run-qemu \
         "${disk_args[@]}" \
         -device i6300esb -watchdog-action poweroff \
-        -append "panic=1 oops=panic softlockup_panic=1 systemd.crash_reboot \"root=LABEL=  rdinit=/bin/sh\" rw rd.retry=3 console=ttyS0,115200n81 rd.shell=0 $DEBUGFAIL" \
+        -append 'rw "root=LABEL=  rdinit=/bin/sh" rd.retry=3' \
         -initrd "$TESTDIR"/initramfs.testing || return 1
 
     test_marker_check || return 1
@@ -59,12 +59,10 @@ test_setup() {
     rm -- "$TESTDIR"/marker.img
 
     # make sure --omit-drivers does not filter out drivers using regexp to test for an earlier regression (assuming there is no one letter linux kernel module needed to run the test)
-    "$DRACUT" -l -i "$TESTDIR"/overlay / \
-        -a "test watchdog" \
-        -d "piix ide-gd_mod ata_piix ext4 i6300esb" \
+    test_dracut \
+        -a "watchdog" \
         --omit-drivers 'a b c d e f g h i j k l m n o p q r s t u v w x y z' \
-        --no-hostonly-cmdline -N \
-        -f "$TESTDIR"/initramfs.testing "$KVERSION" || return 1
+        "$TESTDIR"/initramfs.testing
 }
 
 # shellcheck disable=SC1090

diff --git a/test/TEST-02-SYSTEMD/test.sh b/test/TEST-02-SYSTEMD/test.sh
index ca2551f0c91cab8fea16f0282157ba589bb21416..8ecfd8229acaf3d73dc7fd1448ad13cb4bdbc8ff 100755 (executable)
--- a/test/TEST-02-SYSTEMD/test.sh
+++ b/test/TEST-02-SYSTEMD/test.sh
@@ -17,7 +17,7 @@ test_run() {
     test_marker_reset
     "$testdir"/run-qemu \
         "${disk_args[@]}" \
-        -append "panic=1 oops=panic softlockup_panic=1 systemd.crash_reboot root=LABEL=dracut rw systemd.log_target=console rd.retry=3 rd.info console=ttyS0,115200n81 selinux=0 init=/sbin/init rd.shell=0 $DEBUGFAIL" \
+        -append "root=LABEL=dracut rw systemd.log_target=console rd.retry=3 init=/sbin/init" \
         -initrd "$TESTDIR"/initramfs.testing || return 1
 
     test_marker_check || return 1
@@ -62,13 +62,11 @@ test_setup() {
 
     # systemd-analyze.sh calls man indirectly
     # make the man command succeed always
-    "$DRACUT" -l -i "$TESTDIR"/overlay / \
-        -a "test systemd" \
-        -d "piix ide-gd_mod ata_piix ext4" \
+    test_dracut \
+        -a "systemd" \
         -i ./systemd-analyze.sh /lib/dracut/hooks/pre-pivot/00-systemd-analyze.sh \
         -i "/bin/true" "/usr/bin/man" \
-        --no-hostonly-cmdline -N \
-        -f "$TESTDIR"/initramfs.testing "$KVERSION" || return 1
+        "$TESTDIR"/initramfs.testing
 }
 
 # shellcheck disable=SC1090

diff --git a/test/TEST-03-USR-MOUNT/test.sh b/test/TEST-03-USR-MOUNT/test.sh
index 6dfffc5a1013fb938a6e4fbb9d72085056e3c27f..6ffea37d199d1db9f43ab1f64d8b1db6c50ab54b 100755 (executable)
--- a/test/TEST-03-USR-MOUNT/test.sh
+++ b/test/TEST-03-USR-MOUNT/test.sh
@@ -23,7 +23,7 @@ client_run() {
     "$testdir"/run-qemu \
         "${disk_args[@]}" \
         -device i6300esb -watchdog-action poweroff \
-        -append "panic=1 oops=panic softlockup_panic=1 systemd.crash_reboot root=LABEL=dracut $client_opts rd.retry=3 rd.info console=ttyS0,115200n81 selinux=0 rd.shell=0 $DEBUGFAIL" \
+        -append "root=LABEL=dracut $client_opts rd.retry=3" \
         -initrd "$TESTDIR"/initramfs.testing || return 1
 
     if ! test_marker_check; then
@@ -83,11 +83,10 @@ test_setup() {
         return 1
     fi
 
-    "$DRACUT" -l -i "$TESTDIR"/overlay / \
-        -a "test watchdog" \
-        -d "piix ide-gd_mod ata_piix btrfs i6300esb" \
-        --no-hostonly-cmdline -N \
-        -f "$TESTDIR"/initramfs.testing "$KVERSION" || return 1
+    test_dracut \
+        -a "watchdog" \
+        -d "btrfs" \
+        "$TESTDIR"/initramfs.testing
     rm -rf -- "$TESTDIR"/overlay
 }
 

diff --git a/test/TEST-04-FULL-SYSTEMD/test.sh b/test/TEST-04-FULL-SYSTEMD/test.sh
index 5ec589db0dbd8a2d44b4c961b240585bd1b47e87..5ee0408902c19c8953679e642731a323c46209f8 100755 (executable)
--- a/test/TEST-04-FULL-SYSTEMD/test.sh
+++ b/test/TEST-04-FULL-SYSTEMD/test.sh
@@ -27,7 +27,7 @@ client_run() {
     test_marker_reset
     "$testdir"/run-qemu \
         "${disk_args[@]}" \
-        -append "systemd.unit=testsuite.target systemd.mask=systemd-firstboot rd.multipath=0 panic=1 oops=panic softlockup_panic=1 systemd.crash_reboot root=LABEL=dracut $client_opts rd.retry=3 console=ttyS0,115200n81 selinux=0 $DEBUGOUT rd.shell=0 $DEBUGFAIL" \
+        -append "systemd.unit=testsuite.target systemd.mask=systemd-firstboot rd.multipath=0 root=LABEL=dracut $client_opts rd.retry=3 $DEBUGOUT" \
         -initrd "$TESTDIR"/initramfs.testing || return 1
 
     if ! test_marker_check; then
@@ -152,12 +152,11 @@ EOF
     [ -e /etc/machine-id ] && EXTRA_MACHINE="/etc/machine-id"
     [ -e /etc/machine-info ] && EXTRA_MACHINE+=" /etc/machine-info"
 
-    "$DRACUT" -l -i "$TESTDIR"/overlay / \
-        -a "test systemd i18n qemu" \
+    test_dracut \
+        -a "systemd i18n qemu" \
+        -d "btrfs" \
         ${EXTRA_MACHINE:+-I "$EXTRA_MACHINE"} \
-        -d "piix ide-gd_mod ata_piix btrfs i6300esb" \
-        --no-hostonly-cmdline -N \
-        -f "$TESTDIR"/initramfs.testing "$KVERSION" || return 1
+        "$TESTDIR"/initramfs.testing
 
     rm -rf -- "$TESTDIR"/overlay
 }

diff --git a/test/TEST-10-RAID/test.sh b/test/TEST-10-RAID/test.sh
index 04b1b6799f3dcaddf3c7e3e532826af38f9291fd..2bfb155b97c329b8c6b421b92649498639e77ba4 100755 (executable)
--- a/test/TEST-10-RAID/test.sh
+++ b/test/TEST-10-RAID/test.sh
@@ -16,7 +16,7 @@ test_run() {
     test_marker_reset
     "$testdir"/run-qemu \
         "${disk_args[@]}" \
-        -append "panic=1 oops=panic softlockup_panic=1 systemd.crash_reboot root=/dev/dracut/root rd.auto rw rd.retry=10 console=ttyS0,115200n81 selinux=0 rd.shell=0 $DEBUGFAIL" \
+        -append "root=/dev/dracut/root rd.auto rw" \
         -initrd "$TESTDIR"/initramfs.testing || return 1
 
     test_marker_check || return 1
@@ -63,14 +63,11 @@ test_setup() {
     echo "testluks UUID=$ID_FS_UUID /etc/key" > /tmp/crypttab
     echo -n "test" > /tmp/key
 
-    "$DRACUT" -l -i "$TESTDIR"/overlay / \
-        -a "test" \
-        -d "piix ide-gd_mod ata_piix ext4" \
-        --no-hostonly-cmdline -N \
+    test_dracut \
         -i "./cryptroot-ask.sh" "/sbin/cryptroot-ask" \
         -i "/tmp/crypttab" "/etc/crypttab" \
         -i "/tmp/key" "/etc/key" \
-        -f "$TESTDIR"/initramfs.testing "$KVERSION" || return 1
+        "$TESTDIR"/initramfs.testing
 }
 
 # shellcheck disable=SC1090

diff --git a/test/TEST-11-LVM/test.sh b/test/TEST-11-LVM/test.sh
index 2a7d51f27fa6f0a6efc7d734d59b953df513c253..26f250cd1813da4d762279c5d7f0bf615d36080d 100755 (executable)
--- a/test/TEST-11-LVM/test.sh
+++ b/test/TEST-11-LVM/test.sh
@@ -17,7 +17,7 @@ test_run() {
     test_marker_reset
     "$testdir"/run-qemu \
         "${disk_args[@]}" \
-        -append "panic=1 oops=panic softlockup_panic=1 systemd.crash_reboot root=/dev/dracut/root rw rd.auto=1 quiet rd.retry=3 rd.info console=ttyS0,115200n81 selinux=0 rd.shell=0 $DEBUGFAIL" \
+        -append "root=/dev/dracut/root rw rd.auto=1 rd.retry=3" \
         -initrd "$TESTDIR"/initramfs.testing || return 1
 
     test_marker_check || return 1
@@ -61,11 +61,8 @@ test_setup() {
         -initrd "$TESTDIR"/initramfs.makeroot || return 1
     test_marker_check dracut-root-block-created || return 1
 
-    "$DRACUT" -l -i "$TESTDIR"/overlay / \
-        -a "test" \
-        -d "piix ide-gd_mod ata_piix ext4" \
-        --no-hostonly-cmdline -N \
-        -f "$TESTDIR"/initramfs.testing "$KVERSION" || return 1
+    test_dracut \
+        "$TESTDIR"/initramfs.testing
 }
 
 # shellcheck disable=SC1090

diff --git a/test/TEST-12-RAID-DEG/test.sh b/test/TEST-12-RAID-DEG/test.sh
index 9a160df034904804d77c5ecc215adc30fce06fb1..a65f810e472e1548a4bbd0f929461ea6ea37bd0c 100755 (executable)
--- a/test/TEST-12-RAID-DEG/test.sh
+++ b/test/TEST-12-RAID-DEG/test.sh
@@ -21,7 +21,7 @@ client_run() {
     test_marker_reset
     "$testdir"/run-qemu \
         "${disk_args[@]}" \
-        -append "panic=1 oops=panic softlockup_panic=1 systemd.crash_reboot $* systemd.log_target=kmsg root=LABEL=root rw rd.retry=10 rd.info console=ttyS0,115200n81 log_buf_len=2M selinux=0 rd.shell=0 $DEBUGFAIL " \
+        -append "$* systemd.log_target=kmsg root=LABEL=root rw log_buf_len=2M" \
         -initrd "$TESTDIR"/initramfs.testing
 
     if ! test_marker_check; then
@@ -101,16 +101,13 @@ test_setup() {
     echo -n test > /tmp/key
     chmod 0600 /tmp/key
 
-    "$DRACUT" -l -i "$TESTDIR"/overlay / \
+    test_dracut \
         -o "dbus" \
-        -a "test" \
-        -d "piix ide-gd_mod ata_piix ext4" \
         -i "./cryptroot-ask.sh" "/sbin/cryptroot-ask" \
         -i "/tmp/mdadm.conf" "/etc/mdadm.conf" \
         -i "/tmp/crypttab" "/etc/crypttab" \
         -i "/tmp/key" "/etc/key" \
-        --no-hostonly-cmdline -N \
-        -f "$TESTDIR"/initramfs.testing "$KVERSION" || return 1
+        "$TESTDIR"/initramfs.testing
 }
 
 # shellcheck disable=SC1090

diff --git a/test/TEST-13-ENC-RAID-LVM/test.sh b/test/TEST-13-ENC-RAID-LVM/test.sh
index 13bfdcd0f92ceb6cce0741762ac0915d64584e31..afaa78118e052435b189625be7e83a95df10ea81 100755 (executable)
--- a/test/TEST-13-ENC-RAID-LVM/test.sh
+++ b/test/TEST-13-ENC-RAID-LVM/test.sh
@@ -22,7 +22,7 @@ test_run() {
     test_marker_reset
     "$testdir"/run-qemu \
         "${disk_args[@]}" \
-        -append "panic=1 oops=panic softlockup_panic=1 systemd.crash_reboot root=/dev/dracut/root rw rd.auto rd.retry=20 console=ttyS0,115200n81 selinux=0 rootwait $LUKSARGS rd.shell=0 $DEBUGFAIL" \
+        -append "root=/dev/dracut/root rw rd.auto rd.retry=20 rootwait $LUKSARGS" \
         -initrd "$TESTDIR"/initramfs.testing
     test_marker_check || return 1
     echo "CLIENT TEST END: [OK]"
@@ -32,7 +32,7 @@ test_run() {
     echo "CLIENT TEST START: Any LUKS"
     "$testdir"/run-qemu \
         "${disk_args[@]}" \
-        -append "panic=1 oops=panic softlockup_panic=1 systemd.crash_reboot root=/dev/dracut/root rw quiet rd.auto rd.retry=20 rd.info console=ttyS0,115200n81 selinux=0 $DEBUGFAIL" \
+        -append "root=/dev/dracut/root rw rd.auto rd.retry=20" \
         -initrd "$TESTDIR"/initramfs.testing
     test_marker_check || return 1
     echo "CLIENT TEST END: [OK]"
@@ -42,7 +42,7 @@ test_run() {
     echo "CLIENT TEST START: Wrong LUKS UUID"
     "$testdir"/run-qemu \
         "${disk_args[@]}" \
-        -append "panic=1 oops=panic softlockup_panic=1 systemd.crash_reboot root=/dev/dracut/root rw quiet rd.auto rd.retry=10 rd.info console=ttyS0,115200n81 selinux=0 $DEBUGFAIL rd.luks.uuid=failme" \
+        -append "root=/dev/dracut/root rw rd.auto rd.luks.uuid=failme" \
         -initrd "$TESTDIR"/initramfs.testing
     test_marker_check && return 1
     echo "CLIENT TEST END: [OK]"
@@ -102,14 +102,11 @@ test_setup() {
     echo -n test > /tmp/key
     chmod 0600 /tmp/key
 
-    "$DRACUT" -l -i "$TESTDIR"/overlay / \
-        -a "test" \
-        -d "piix ide-gd_mod ata_piix ext4 sd_mod" \
+    test_dracut \
         -i "./cryptroot-ask.sh" "/sbin/cryptroot-ask" \
         -i "/tmp/crypttab" "/etc/crypttab" \
         -i "/tmp/key" "/etc/key" \
-        --no-hostonly-cmdline -N \
-        -f "$TESTDIR"/initramfs.testing "$KVERSION" || return 1
+        "$TESTDIR"/initramfs.testing
 }
 
 # shellcheck disable=SC1090

diff --git a/test/TEST-14-IMSM/test.sh b/test/TEST-14-IMSM/test.sh
index c715d609057e4c4dfee5e5ebbd384e802266b539..722fe549b077abf0e39ae74d34080ef4f788aa41 100755 (executable)
--- a/test/TEST-14-IMSM/test.sh
+++ b/test/TEST-14-IMSM/test.sh
@@ -18,7 +18,7 @@ client_run() {
     test_marker_reset
     "$testdir"/run-qemu \
         "${disk_args[@]}" \
-        -append "panic=1 oops=panic softlockup_panic=1 systemd.crash_reboot $* root=LABEL=root rw rd.retry=5 console=ttyS0,115200n81 selinux=0 rd.info rd.shell=0 $DEBUGFAIL" \
+        -append "$* root=LABEL=root rw rd.retry=5" \
         -initrd "$TESTDIR"/initramfs.testing || return 1
 
     if ! test_marker_check; then
@@ -93,11 +93,9 @@ test_setup() {
     fi
 
     echo "$MD_UUID" > "$TESTDIR"/mduuid
-    "$DRACUT" -l -i "$TESTDIR"/overlay / \
-        -a "test" \
-        -d "piix ide-gd_mod ata_piix ext4" \
-        --no-hostonly-cmdline -N \
-        -f "$TESTDIR"/initramfs.testing "$KVERSION" || return 1
+
+    test_dracut \
+        "$TESTDIR"/initramfs.testing
 }
 
 # shellcheck disable=SC1090

diff --git a/test/TEST-15-BTRFSRAID/test.sh b/test/TEST-15-BTRFSRAID/test.sh
index 5d193eb76d4a3595999b0c7c3a09756250f42707..9e62873ed40e137958b0597ec132492c8bcbf0f9 100755 (executable)
--- a/test/TEST-15-BTRFSRAID/test.sh
+++ b/test/TEST-15-BTRFSRAID/test.sh
@@ -16,7 +16,7 @@ test_run() {
     test_marker_reset
     "$testdir"/run-qemu \
         "${disk_args[@]}" \
-        -append "panic=1 oops=panic softlockup_panic=1 systemd.crash_reboot root=LABEL=root rw rd.retry=3 rd.info console=ttyS0,115200n81 selinux=0 rd.shell=0 $DEBUGFAIL" \
+        -append "root=LABEL=root rw rd.retry=3" \
         -initrd "$TESTDIR"/initramfs.testing
     test_marker_check || return 1
 }
@@ -68,11 +68,9 @@ test_setup() {
 
     test_marker_check dracut-root-block-created || return 1
 
-    "$DRACUT" -l -i "$TESTDIR"/overlay / \
-        -a "test" \
-        -d "piix ide-gd_mod ata_piix btrfs" \
-        --no-hostonly-cmdline -N \
-        -f "$TESTDIR"/initramfs.testing "$KVERSION" || return 1
+    test_dracut \
+        -d "btrfs" \
+        "$TESTDIR"/initramfs.testing
 }
 
 # shellcheck disable=SC1090

diff --git a/test/TEST-16-DMSQUASH/test.sh b/test/TEST-16-DMSQUASH/test.sh
index 0b274303fe3a62154431abe04269fb2bf8657f2f..f1d8a7aaab6fd463db17a108db4f34a1ee723d53 100755 (executable)
--- a/test/TEST-16-DMSQUASH/test.sh
+++ b/test/TEST-16-DMSQUASH/test.sh
@@ -21,7 +21,7 @@ test_run() {
     "$testdir"/run-qemu \
         "${disk_args[@]}" \
         -boot order=d \
-        -append "rd.live.overlay.overlayfs=1 root=live:/dev/disk/by-label/dracut console=ttyS0,115200n81 quiet selinux=0 rd.info rd.shell=0 panic=1 oops=panic softlockup_panic=1 $DEBUGFAIL" \
+        -append "rd.live.overlay.overlayfs=1 root=live:/dev/disk/by-label/dracut" \
         -initrd "$TESTDIR"/initramfs.testing
 
     test_marker_check || return 1
@@ -30,7 +30,7 @@ test_run() {
     "$testdir"/run-qemu \
         "${disk_args[@]}" \
         -boot order=d \
-        -append "rd.live.image rd.live.overlay.overlayfs=1 root=LABEL=dracut console=ttyS0,115200n81 quiet selinux=0 rd.info rd.shell=0 panic=1 oops=panic softlockup_panic=1 $DEBUGFAIL" \
+        -append "rd.live.image rd.live.overlay.overlayfs=1 root=LABEL=dracut" \
         -initrd "$TESTDIR"/initramfs.testing
 
     test_marker_check || return 1
@@ -39,7 +39,7 @@ test_run() {
     "$testdir"/run-qemu \
         "${disk_args[@]}" \
         -boot order=d \
-        -append "rd.live.image rd.live.overlay.overlayfs=1 rd.live.dir=testdir root=LABEL=dracut console=ttyS0,115200n81 quiet selinux=0 rd.info rd.shell=0 panic=1 oops=panic softlockup_panic=1 $DEBUGFAIL" \
+        -append "rd.live.image rd.live.overlay.overlayfs=1 rd.live.dir=testdir root=LABEL=dracut" \
         -initrd "$TESTDIR"/initramfs.testing
 
     test_marker_check || return 1
@@ -50,7 +50,7 @@ test_run() {
         "$testdir"/run-qemu \
             "${disk_args[@]}" \
             -boot order=d \
-            -append "rd.live.image rd.live.overlay.overlayfs=1 rd.live.dir=testdir root=LABEL=dracut_ntfs console=ttyS0,115200n81 quiet selinux=0 rd.info rd.shell=0 panic=1 oops=panic softlockup_panic=1 $DEBUGFAIL" \
+            -append "rd.live.image rd.live.overlay.overlayfs=1 rd.live.dir=testdir root=LABEL=dracut_ntfs quiet rd.info rd.shell=0" \
             -initrd "$TESTDIR"/initramfs.testing
 
         test_marker_check || return 1
@@ -131,20 +131,17 @@ test_setup() {
 SUBSYSTEM=="block", ENV{ID_FS_TYPE}=="ntfs", ENV{ID_FS_TYPE}="ntfs3"
 EOF
 
-    "$DRACUT" -l -i "$TESTDIR"/overlay / \
-        --modules "test dash dmsquash-live qemu" \
-        --drivers "ext4 ntfs3 sd_mod" \
+    test_dracut \
+        --modules "dash dmsquash-live qemu" \
+        --drivers "ntfs3" \
         --install "mkfs.ext4" \
         --include /tmp/ntfs3.rules /lib/udev/rules.d/ntfs3.rules \
-        --no-hostonly --no-hostonly-cmdline \
-        --force "$TESTDIR"/initramfs.testing "$KVERSION" || return 1
+        "$TESTDIR"/initramfs.testing
 
-    "$DRACUT" -l -i "$TESTDIR"/overlay / \
-        --modules "test dmsquash-live-autooverlay qemu" \
-        --drivers "ext4" \
+    test_dracut \
+        --modules "dmsquash-live-autooverlay qemu" \
         --install "mkfs.ext4" \
-        --no-hostonly --no-hostonly-cmdline \
-        --force "$TESTDIR"/initramfs.testing-autooverlay "$KVERSION" || return 1
+        "$TESTDIR"/initramfs.testing-autooverlay
 
     rm -rf -- "$TESTDIR"/overlay
 }

diff --git a/test/TEST-17-LVM-THIN/test.sh b/test/TEST-17-LVM-THIN/test.sh
index 8e1782b1d6002d10effd0ae42743eba1ad0d774b..db80430bd8f606e28aa23e85d2fa27818eee2140 100755 (executable)
--- a/test/TEST-17-LVM-THIN/test.sh
+++ b/test/TEST-17-LVM-THIN/test.sh
@@ -16,7 +16,7 @@ test_run() {
     test_marker_reset
     "$testdir"/run-qemu \
         "${disk_args[@]}" \
-        -append "panic=1 oops=panic softlockup_panic=1 systemd.crash_reboot root=/dev/dracut/root rw rd.auto=1 rd.driver.pre=dm_thin_pool quiet rd.retry=3 rd.info console=ttyS0,115200n81 selinux=0 rd.shell=0 $DEBUGFAIL" \
+        -append "root=/dev/dracut/root rw rd.auto=1 rd.driver.pre=dm_thin_pool rd.retry=3" \
         -initrd "$TESTDIR"/initramfs.testing || return 1
     test_marker_check || return 1
 }
@@ -61,11 +61,9 @@ test_setup() {
         -initrd "$TESTDIR"/initramfs.makeroot || return 1
     test_marker_check dracut-root-block-created || return 1
 
-    "$DRACUT" -l -i "$TESTDIR"/overlay / \
-        -a "test" -I lvs \
-        -d "piix ide-gd_mod ata_piix ext4 sd_mod" \
-        --no-hostonly-cmdline -N \
-        -f "$TESTDIR"/initramfs.testing "$KVERSION" || return 1
+    test_dracut \
+        -I lvs \
+        "$TESTDIR"/initramfs.testing
 }
 
 # shellcheck disable=SC1090

diff --git a/test/TEST-18-UEFI/test.sh b/test/TEST-18-UEFI/test.sh
index a214f65468d5b8dbb23e25abff9405d74ec28803..f231cc3d60004e2a3fbb4a8036c50863865e57a3 100755 (executable)
--- a/test/TEST-18-UEFI/test.sh
+++ b/test/TEST-18-UEFI/test.sh
@@ -42,7 +42,7 @@ test_setup() {
 
     mkdir -p "$TESTDIR"/ESP/EFI/BOOT
     test_dracut \
-        --modules 'rootfs-block test' \
+        --modules 'rootfs-block' \
         --kernel-cmdline 'root=/dev/disk/by-id/scsi-0QEMU_QEMU_HARDDISK_root ro rd.skipfsck rootfstype=squashfs' \
         --drivers 'squashfs' \
         --uefi \

diff --git a/test/TEST-20-NFS/test.sh b/test/TEST-20-NFS/test.sh
index fa09bd1c65296e9e17de4b47856287dcaf1f911d..8bc4eb774b8bba51ab5a4f6957813259a30a9763 100755 (executable)
--- a/test/TEST-20-NFS/test.sh
+++ b/test/TEST-20-NFS/test.sh
@@ -68,7 +68,7 @@ client_test() {
         -net nic,macaddr="$mac",model=e1000 \
         -net socket,connect=127.0.0.1:12320 \
         -device i6300esb -watchdog-action poweroff \
-        -append "panic=1 oops=panic softlockup_panic=1 systemd.crash_reboot rd.shell=0 $cmdline $DEBUGFAIL rd.retry=10 quiet ro console=ttyS0,115200n81 selinux=0" \
+        -append "$cmdline ro" \
         -initrd "$TESTDIR"/initramfs.testing
 
     # shellcheck disable=SC2181
@@ -403,10 +403,9 @@ test_setup() {
     )
 
     # Make client's dracut image
-    "$DRACUT" -l -i "$TESTDIR"/overlay / \
-        -a "dmsquash-live debug watchdog ${USE_NETWORK}" \
-        --no-hostonly-cmdline -N \
-        -f "$TESTDIR"/initramfs.testing "$KVERSION" || return 1
+    test_dracut \
+        -a "dmsquash-live watchdog ${USE_NETWORK}" \
+        "$TESTDIR"/initramfs.testing
 
     (
         # shellcheck disable=SC2031

diff --git a/test/TEST-35-ISCSI-MULTI/test.sh b/test/TEST-35-ISCSI-MULTI/test.sh
index 7962e7b3b8e89494dd06944fcd2507fc3bf82862..13d250bda5247d0c30c52b806f0cb39a5163f5e5 100755 (executable)
--- a/test/TEST-35-ISCSI-MULTI/test.sh
+++ b/test/TEST-35-ISCSI-MULTI/test.sh
@@ -60,7 +60,7 @@ run_client() {
         -net nic,macaddr=52:54:00:12:34:00,model=e1000 \
         -net nic,macaddr=52:54:00:12:34:01,model=e1000 \
         -net socket,connect=127.0.0.1:12331 \
-        -append "panic=1 oops=panic softlockup_panic=1 systemd.crash_reboot rw rd.auto rd.retry=50 console=ttyS0,115200n81 selinux=0 rd.shell=0 $DEBUGFAIL $*" \
+        -append "rw rd.auto rd.retry=50 $*" \
         -initrd "$TESTDIR"/initramfs.testing
     if ! test_marker_check iscsi-OK; then
         echo "CLIENT TEST END: $test_name [FAILED - BAD EXIT]"
@@ -232,9 +232,8 @@ test_setup() {
     # Make client's dracut image
     test_dracut \
         --add "$USE_NETWORK" \
-        --no-hostonly-cmdline -N \
         -i "./client.link" "/etc/systemd/network/01-client.link" \
-        -f "$TESTDIR"/initramfs.testing "$KVERSION" || return 1
+        "$TESTDIR"/initramfs.testing
 
     # Make server's dracut image
     "$DRACUT" -l -i "$TESTDIR"/overlay / \

diff --git a/test/TEST-40-NBD/test.sh b/test/TEST-40-NBD/test.sh
index 732171c293bc2100a52035c7d42463813e1be19f..4be53b79d7deda4c80fc20c0ebd20709c9d090dc 100755 (executable)
--- a/test/TEST-40-NBD/test.sh
+++ b/test/TEST-40-NBD/test.sh
@@ -80,7 +80,7 @@ client_test() {
         "${disk_args[@]}" \
         -net nic,macaddr="$mac",model=e1000 \
         -net socket,connect=127.0.0.1:12340 \
-        -append "panic=1 oops=panic softlockup_panic=1 systemd.crash_reboot rd.shell=0 $cmdline $DEBUGFAIL rd.auto rd.info rd.retry=10 ro console=ttyS0,115200n81  selinux=0  " \
+        -append "$cmdline rd.auto ro" \
         -initrd "$TESTDIR"/initramfs.testing
 
     # shellcheck disable=SC2181
@@ -334,14 +334,13 @@ test_setup() {
     echo "luks-$ID_FS_UUID /dev/nbd0 /etc/key" > /tmp/crypttab
     echo -n test > /tmp/key
 
-    "$DRACUT" -l -i "$TESTDIR"/overlay / \
-        -a "test debug watchdog ${USE_NETWORK}" \
+    test_dracut \
+        -a "watchdog ${USE_NETWORK}" \
         -i "./cryptroot-ask.sh" "/sbin/cryptroot-ask" \
         -i "./client.link" "/etc/systemd/network/01-client.link" \
         -i "/tmp/crypttab" "/etc/crypttab" \
         -i "/tmp/key" "/etc/key" \
-        --no-hostonly-cmdline -N \
-        -f "$TESTDIR"/initramfs.testing "$KVERSION" || return 1
+        "$TESTDIR"/initramfs.testing
 
     "$DRACUT" -l -i "$TESTDIR"/overlay / \
         -a "test rootfs-block debug kernel-modules network network-legacy" \

diff --git a/test/TEST-50-MULTINIC/test.sh b/test/TEST-50-MULTINIC/test.sh
index 83263bc0b02224f94c38d6cc393393f6ff230372..750437de409a2e80c8f81b866a8671716a3bfdd7 100755 (executable)
--- a/test/TEST-50-MULTINIC/test.sh
+++ b/test/TEST-50-MULTINIC/test.sh
@@ -78,7 +78,7 @@ client_test() {
         -device e1000,netdev=n1,mac=52:54:00:12:34:98 \
         -device e1000,netdev=n2,mac=52:54:00:12:34:99 \
         -device i6300esb -watchdog-action poweroff \
-        -append "quiet panic=1 oops=panic softlockup_panic=1 systemd.crash_reboot rd.shell=0 $cmdline $DEBUGFAIL rd.retry=5 ro console=ttyS0,115200n81 selinux=0 init=/sbin/init systemd.log_target=console" \
+        -append "$cmdline rd.retry=5 ro init=/sbin/init systemd.log_target=console" \
         -initrd "$TESTDIR"/initramfs.testing || return 1
 
     {
@@ -342,10 +342,9 @@ test_setup() {
         inst_hook pre-pivot 85 "$PKGLIBDIR/modules.d/45ifcfg/write-ifcfg.sh"
     )
     # Make client's dracut image
-    "$DRACUT" -l -i "$TESTDIR"/overlay / \
+    test_dracut \
         -a "debug watchdog ${USE_NETWORK}" \
-        --no-hostonly-cmdline -N \
-        -f "$TESTDIR"/initramfs.testing "$KVERSION" || return 1
+        "$TESTDIR"/initramfs.testing
 
     (
         # shellcheck disable=SC2031

diff --git a/test/TEST-60-BONDBRIDGEVLAN/test.sh b/test/TEST-60-BONDBRIDGEVLAN/test.sh
index cd7b1cd70234d56b4669283d479815f3ec3de40b..fe1fcb502fe76bef4965c393eb8d3c5c38272992 100755 (executable)
--- a/test/TEST-60-BONDBRIDGEVLAN/test.sh
+++ b/test/TEST-60-BONDBRIDGEVLAN/test.sh
@@ -94,14 +94,13 @@ client_test() {
         -hda "$TESTDIR"/client.img \
         -device i6300esb -watchdog-action poweroff \
         -append "
-        panic=1 oops=panic softlockup_panic=1
         ifname=net1:52:54:00:12:34:01
         ifname=net2:52:54:00:12:34:02
         ifname=net3:52:54:00:12:34:03
         ifname=net4:52:54:00:12:34:04
         ifname=net5:52:54:00:12:34:05
-        $cmdline rd.net.timeout.dhcp=30 systemd.crash_reboot
-        $DEBUGFAIL rd.retry=5 rw console=ttyS0,115200n81 selinux=0 init=/sbin/init" \
+        $cmdline rd.net.timeout.dhcp=30
+        rd.retry=5 rw init=/sbin/init" \
         -initrd "$TESTDIR"/initramfs.testing || return 1
 
     {
@@ -369,11 +368,9 @@ test_setup() {
         inst_simple ./client.link /etc/systemd/network/01-client.link
     )
     # Make client's dracut image
-    "$DRACUT" -l -i "$TESTDIR"/overlay / \
-        --no-early-microcode \
+    test_dracut \
         -a "debug ${USE_NETWORK} ifcfg" \
-        --no-hostonly-cmdline -N \
-        -f "$TESTDIR"/initramfs.testing "$KVERSION" || return 1
+        "$TESTDIR"/initramfs.testing
 
     (
         # shellcheck disable=SC2031

diff --git a/test/TEST-63-DRACUT-CPIO/test.sh b/test/TEST-63-DRACUT-CPIO/test.sh
index 2579de74da6e2e5eece713884c65cf4539349c84..1b18620ffc7d8de89bedf430472d330384ae76e1 100755 (executable)
--- a/test/TEST-63-DRACUT-CPIO/test.sh
+++ b/test/TEST-63-DRACUT-CPIO/test.sh
@@ -26,14 +26,12 @@ echo "Image with ${dracut_cpio_params[*]} booted successfully"
 poweroff -f
 EOF
 
-    "$DRACUT" -l --no-kernel --drivers "" \
+    test_dracut \
+        --no-kernel --drivers "" \
         "${dracut_cpio_params[@]}" \
-        --modules "test" \
         --include "$tdir/init.sh" /lib/dracut/hooks/emergency/00-init.sh \
         --install "poweroff" \
-        --no-hostonly --no-hostonly-cmdline \
-        "$tdir/initramfs" \
-        || return 1
+        "$tdir/initramfs"
 
     "$testdir"/run-qemu \
         -device i6300esb -watchdog-action poweroff \

diff --git a/test/test-functions b/test/test-functions
index ba9ca792e5116456f9769b1f18d3d82d4cd54035..992e3651fac1086b8979f45b5e37b207b96b1b10 100644 (file)
--- a/test/test-functions
+++ b/test/test-functions
@@ -20,13 +20,18 @@ DRACUT=${DRACUT-${basedir}/dracut.sh}
 PKGLIBDIR=${PKGLIBDIR-$basedir}
 
 test_dracut() {
-    TEST_DRACUT_ARGS+=" --local --no-hostonly --no-early-microcode --add test --kver $KVERSION"
+    TEST_DRACUT_ARGS+=" --local --no-hostonly --no-hostonly-cmdline --no-early-microcode --add test --force --kver $KVERSION"
+
+    # include $TESTDIR"/overlay if exists
+    if [ -d "$TESTDIR"/overlay ]; then
+        TEST_DRACUT_ARGS+=" --include $TESTDIR/overlay /"
+    fi
 
     # shellcheck disable=SC2162
     IFS=' ' read -a TEST_DRACUT_ARGS_ARRAY <<< "$TEST_DRACUT_ARGS"
 
     "$DRACUT" "$@" \
-        --kernel-cmdline "panic=1 oops=panic softlockup_panic=1 systemd.crash_reboot selinux=0 console=ttyS0,115200n81 $DEBUGFAIL" \
+        --kernel-cmdline "panic=1 oops=panic softlockup_panic=1 systemd.crash_reboot quiet rd.retry=10 rd.info rd.shell=0 selinux=0 console=ttyS0,115200n81 $DEBUGFAIL" \
         "${TEST_DRACUT_ARGS_ARRAY[@]}" || return 1
 }