From ae3ecffbd2e40760fef5dc09db30ea8a81abec70 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Mon, 26 Aug 2024 12:33:11 +0200 Subject: Merging upstream version 103. Signed-off-by: Daniel Baumann --- test/TEST-14-IMSM/test.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'test/TEST-14-IMSM/test.sh') diff --git a/test/TEST-14-IMSM/test.sh b/test/TEST-14-IMSM/test.sh index fc3e429..3d43154 100755 --- 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 "$* root=LABEL=root rw rd.retry=5" \ + -append "$TEST_KERNEL_CMDLINE $* root=LABEL=root rw rd.retry=5" \ -initrd "$TESTDIR"/initramfs.testing || return 1 if ! test_marker_check; then @@ -60,7 +60,7 @@ test_setup() { # We do it this way so that we do not risk trashing the host mdraid # devices, volume groups, encrypted partitions, etc. "$DRACUT" -N -l -i "$TESTDIR"/overlay / \ - -m "test-makeroot bash lvm mdraid dmraid kernel-modules" \ + -a "test-makeroot bash lvm mdraid dmraid kernel-modules" \ -d "piix ide-gd_mod ata_piix ext4 sd_mod dm-multipath dm-crypt dm-round-robin faulty linear multipath raid0 raid10 raid1 raid456" \ -I "grep sfdisk realpath" \ -i ./create-root.sh /lib/dracut/hooks/initqueue/01-create-root.sh \ @@ -77,7 +77,7 @@ test_setup() { # Invoke KVM and/or QEMU to actually create the target filesystem. "$testdir"/run-qemu \ "${disk_args[@]}" \ - -append "root=/dev/dracut/root rw rootfstype=ext4 quiet console=ttyS0,115200n81 selinux=0" \ + -append "root=/dev/dracut/root rw rootfstype=ext4 quiet console=ttyS0,115200n81" \ -initrd "$TESTDIR"/initramfs.makeroot || return 1 test_marker_check dracut-root-block-created || return 1 eval "$(grep -F --binary-files=text -m 1 MD_UUID "$TESTDIR"/marker.img)" -- cgit v1.2.3