1 files changed, 23 insertions, 32 deletions

diff --git a/test/TEST-16-DMSQUASH/test.sh b/test/TEST-16-DMSQUASH/test.sh
index 3fecc92..6087ccd 100755
--- a/test/TEST-16-DMSQUASH/test.sh
+++ b/test/TEST-16-DMSQUASH/test.sh
@@ -9,19 +9,19 @@ TEST_DESCRIPTION="live root on a squash filesystem"
 test_run() {
     declare -a disk_args=()
     declare -i disk_index=0
-    qemu_add_drive_args disk_index disk_args "$TESTDIR"/marker.img marker
-    qemu_add_drive_args disk_index disk_args "$TESTDIR"/root.img root
+    qemu_add_drive disk_index disk_args "$TESTDIR"/marker.img marker
+    qemu_add_drive disk_index disk_args "$TESTDIR"/root.img root
 
     # NTFS drive
     if modprobe --dry-run ntfs3 &> /dev/null && command -v mkfs.ntfs &> /dev/null; then
-        qemu_add_drive_args disk_index disk_args "$TESTDIR"/root_ntfs.img root_ntfs
+        qemu_add_drive disk_index disk_args "$TESTDIR"/root_ntfs.img root_ntfs
     fi
 
     test_marker_reset
     "$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,18 +39,18 @@ 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
 
     # Run the NTFS test only if mkfs.ntfs is available
     if modprobe --dry-run ntfs3 &> /dev/null && command -v mkfs.ntfs &> /dev/null; then
-        dd if=/dev/zero of="$TESTDIR"/marker.img bs=1MiB count=1
+        dd if=/dev/zero of="$TESTDIR"/marker.img bs=1MiB count=1 status=none
         "$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
@@ -63,7 +63,7 @@ test_run() {
     "$testdir"/run-qemu \
         "${disk_args[@]}" \
         -boot order=d \
-        -append "rd.live.image rd.live.overlay.overlayfs=1 rd.live.overlay=LABEL=persist 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 "init=/sbin/init-persist rd.live.image rd.live.overlay.overlayfs=1 rd.live.overlay=LABEL=persist 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" \
         -initrd "$TESTDIR"/initramfs.testing-autooverlay
 
     rootPartitions=$(sfdisk -d "$TESTDIR"/root.img | grep -c 'root\.img[0-9]')
@@ -81,12 +81,9 @@ test_run() {
 
 test_setup() {
     # Create what will eventually be our root filesystem onto an overlay
-    "$DRACUT" -l --keep --tmpdir "$TESTDIR" \
+    "$DRACUT" -N -l --keep --tmpdir "$TESTDIR" \
         -m "test-root" \
-        -i ./test-init.sh /sbin/init \
-        -i "${PKGLIBDIR}/modules.d/99base/dracut-lib.sh" "/lib/dracut-lib.sh" \
-        -i "${PKGLIBDIR}/modules.d/99base/dracut-dev-lib.sh" "/lib/dracut-dev-lib.sh" \
-        --no-hostonly --no-hostonly-cmdline --nomdadmconf --nohardlink \
+        -i ./test-init.sh /sbin/init-persist \
         -f "$TESTDIR"/initramfs.root "$KVERSION" || return 1
     mkdir -p "$TESTDIR"/overlay/source && mv "$TESTDIR"/dracut.*/initramfs/* "$TESTDIR"/overlay/source && rm -rf "$TESTDIR"/dracut.*
 
@@ -94,25 +91,24 @@ test_setup() {
     # create an initramfs that will create the target root filesystem.
     # We do it this way so that we do not risk trashing the host mdraid
     # devices, volume groups, encrypted partitions, etc.
-    "$DRACUT" -l -i "$TESTDIR"/overlay / \
+    "$DRACUT" -N -l -i "$TESTDIR"/overlay / \
         --modules "test-makeroot" \
-        --install "sfdisk mkfs.ext4 mkfs.ntfs mksquashfs" \
+        --install "sfdisk mkfs.ntfs mksquashfs" \
         --drivers "ntfs3" \
         --include ./create-root.sh /lib/dracut/hooks/initqueue/01-create-root.sh \
-        --no-hostonly --no-hostonly-cmdline --no-early-microcode --nofscks --nomdadmconf --nohardlink --nostrip \
         --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=()
     declare -i disk_index=0
-    qemu_add_drive_args disk_index disk_args "$TESTDIR"/marker.img marker 1
-    qemu_add_drive_args disk_index disk_args "$TESTDIR"/root.img root 160
+    qemu_add_drive disk_index disk_args "$TESTDIR"/marker.img marker 1
+    qemu_add_drive disk_index disk_args "$TESTDIR"/root.img root 160
 
     # NTFS drive
     if modprobe --dry-run ntfs3 &> /dev/null && command -v mkfs.ntfs &> /dev/null; then
         dd if=/dev/zero of="$TESTDIR"/root_ntfs.img bs=1MiB count=160
-        qemu_add_drive_args disk_index disk_args "$TESTDIR"/root_ntfs.img root_ntfs
+        qemu_add_drive disk_index disk_args "$TESTDIR"/root_ntfs.img root_ntfs
     fi
 
     # Invoke KVM and/or QEMU to actually create the target filesystem.
@@ -131,22 +127,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" \
-        --omit "rngd" \
-        --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" \
-        --omit "rngd" \
-        --drivers "ext4 sd_mod" \
+    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
 }