diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-08-26 10:33:11 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-08-26 10:33:11 +0000 |
commit | ae3ecffbd2e40760fef5dc09db30ea8a81abec70 (patch) | |
tree | f3b77bfda1bae06d3326ef27c3cb61539e7f93cc /test/TEST-02-SYSTEMD | |
parent | Adding debian version 102-3. (diff) | |
download | dracut-ae3ecffbd2e40760fef5dc09db30ea8a81abec70.tar.xz dracut-ae3ecffbd2e40760fef5dc09db30ea8a81abec70.zip |
Merging upstream version 103.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to '')
-rwxr-xr-x | test/TEST-02-SYSTEMD/test.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/test/TEST-02-SYSTEMD/test.sh b/test/TEST-02-SYSTEMD/test.sh index 4d48fd2..0a7d05a 100755 --- a/test/TEST-02-SYSTEMD/test.sh +++ b/test/TEST-02-SYSTEMD/test.sh @@ -17,7 +17,7 @@ test_run() { test_marker_reset "$testdir"/run-qemu \ "${disk_args[@]}" \ - -append "root=LABEL=dracut rw systemd.log_target=console rd.retry=3 init=/sbin/init" \ + -append "$TEST_KERNEL_CMDLINE root=LABEL=dracut rw systemd.log_target=console rd.retry=3 init=/sbin/init" \ -initrd "$TESTDIR"/initramfs.testing || return 1 test_marker_check || return 1 @@ -35,7 +35,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" \ + -a "test-makeroot" \ -i ./create-root.sh /lib/dracut/hooks/initqueue/01-create-root.sh \ --nomdadmconf \ --no-hostonly-cmdline -N \ @@ -50,7 +50,7 @@ test_setup() { # Invoke KVM and/or QEMU to actually create the target filesystem. "$testdir"/run-qemu \ "${disk_args[@]}" \ - -append "root=/dev/fakeroot rw rootfstype=ext4 quiet console=ttyS0,115200n81 selinux=0" \ + -append "root=/dev/fakeroot rw rootfstype=ext4 quiet console=ttyS0,115200n81" \ -initrd "$TESTDIR"/initramfs.makeroot || return 1 test_marker_check dracut-root-block-created || return 1 rm -- "$TESTDIR"/marker.img |