File TEST-03-USR-MOUNT-V59-openQA.patch of Package dracut

Overview Repositories Revisions Requests Users Attributes Meta

File TEST-03-USR-MOUNT-V59-openQA.patch of Package dracut (Revision db58d3a1dd4081e07733b3c346693299)

Currently displaying revision db58d3a1dd4081e07733b3c346693299 , Show latest

From 3ea646102fcad3abe20a82f6c62b12b5e0dd76c0 Mon Sep 17 00:00:00 2001
From: nkrapp <nico.krapp@suse.com>
Date: Fri, 5 May 2023 09:56:17 +0200
Subject: [PATCH] Patch TEST-03

---
 test/TEST-03-USR-MOUNT/test.sh | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/test/TEST-03-USR-MOUNT/test.sh b/test/TEST-03-USR-MOUNT/test.sh
index b78b56b1a..d87996b00 100755
--- a/test/TEST-03-USR-MOUNT/test.sh
+++ b/test/TEST-03-USR-MOUNT/test.sh
@@ -5,6 +5,8 @@ TEST_DESCRIPTION="root filesystem on a btrfs filesystem with /usr subvolume"
 
 KVERSION=${KVERSION-$(uname -r)}
 
+export basedir=/usr/lib/dracut
+
 # Uncomment this to debug failures
 #DEBUGFAIL="rd.shell rd.break"
 
@@ -25,7 +27,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 loglevel=7 rd.retry=3 rd.info console=ttyS0,115200n81 selinux=0 rd.debug rd.shell=0 $DEBUGFAIL" \
+        -append "nompath panic=1 oops=panic softlockup_panic=1 systemd.crash_reboot root=LABEL=dracut $client_opts loglevel=7 rd.retry=3 rd.info console=ttyS0,115200n81 selinux=0 rd.debug rd.shell=0 $DEBUGFAIL" \
         -initrd "$TESTDIR"/initramfs.testing || return 1
 
     if ! grep -U --binary-files=binary -F -m 1 -q dracut-root-block-success "$TESTDIR"/marker.img; then
@@ -58,8 +60,9 @@ 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" \
+        -m "test-makeroot bash btrfs rootfs-block kernel-modules" \
         -d "piix ide-gd_mod ata_piix btrfs sd_mod" \
+        -o "systemd-initrd systemd" \
         -I "mkfs.btrfs" \
         -i ./create-root.sh /lib/dracut/hooks/initqueue/01-create-root.sh \
         --nomdadmconf \
@@ -103,4 +106,4 @@ test_cleanup() {
 }
 
 # shellcheck disable=SC1090
-. "$testdir"/test-functions
+. "$basedir"/test/test-functions

Places

File TEST-03-USR-MOUNT-V59-openQA.patch of Package dracut (Revision db58d3a1dd4081e07733b3c346693299)

Places