diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-08-26 10:33:12 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-08-26 10:33:12 +0000 |
| commit | c00ecb2892f783ed18c2f62772665d86ea66a252 (patch) | |
| tree | d4f8f0a3e76745c861141e462bd80850187bb88e /test/TEST-15-BTRFSRAID/test.sh | |
| parent | Releasing progress-linux version 102-3~progress7.99u1. (diff) | |
| download | dracut-c00ecb2892f783ed18c2f62772665d86ea66a252.tar.xz dracut-c00ecb2892f783ed18c2f62772665d86ea66a252.zip | |
Merging upstream version 103.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'test/TEST-15-BTRFSRAID/test.sh')
| -rwxr-xr-x | test/TEST-15-BTRFSRAID/test.sh | 6 |
1 files changed, 3 insertions, 3 deletions
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 |