From 203af7302854f453fa4a05ecefd4403b6c8a4f8d Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Mon, 26 Aug 2024 12:33:11 +0200 Subject: Adding upstream version 103. Signed-off-by: Daniel Baumann --- test/TEST-15-BTRFSRAID/test.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'test/TEST-15-BTRFSRAID') diff --git a/test/TEST-15-BTRFSRAID/test.sh b/test/TEST-15-BTRFSRAID/test.sh index 2745950..2d8c9d9 100755 --- 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 "root=LABEL=root rw rd.retry=3" \ + -append "$TEST_KERNEL_CMDLINE root=LABEL=root rw rd.retry=3" \ -initrd "$TESTDIR"/initramfs.testing test_marker_check || return 1 } @@ -38,7 +38,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 btrfs rootfs-block kernel-modules" \ + -a "test-makeroot bash btrfs rootfs-block kernel-modules" \ -d "piix ide-gd_mod ata_piix btrfs sd_mod" \ -I "mkfs.btrfs" \ -i ./create-root.sh /lib/dracut/hooks/initqueue/01-create-root.sh \ @@ -58,7 +58,7 @@ test_setup() { "$testdir"/run-qemu \ "${disk_args[@]}" \ - -append "root=/dev/fakeroot rw quiet console=ttyS0,115200n81 selinux=0" \ + -append "root=/dev/fakeroot rw quiet console=ttyS0,115200n81" \ -initrd "$TESTDIR"/initramfs.makeroot || return 1 test_marker_check dracut-root-block-created || return 1 -- cgit v1.2.3