From e6f2eaf47a177a8eca054d1d70a1b6287e8c3521 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Mon, 3 Jun 2024 16:01:35 +0200
Subject: Adding upstream version 102.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 test/TEST-63-DRACUT-CPIO/test.sh | 21 ++++++++-------------
 1 file changed, 8 insertions(+), 13 deletions(-)

(limited to 'test/TEST-63-DRACUT-CPIO/test.sh')

diff --git a/test/TEST-63-DRACUT-CPIO/test.sh b/test/TEST-63-DRACUT-CPIO/test.sh
index f9dff10..5bde7b0 100755
--- a/test/TEST-63-DRACUT-CPIO/test.sh
+++ b/test/TEST-63-DRACUT-CPIO/test.sh
@@ -21,28 +21,23 @@ test_dracut_cpio() {
 
     mkdir -p "$tdir"
 
-    # VM script to print sentinel on boot
-    # write to kmsg so that sysrq messages don't race with console output
     cat > "$tdir/init.sh" << EOF
-echo "Image with ${dracut_cpio_params[*]} booted successfully" > /dev/kmsg
-echo 1 > /proc/sys/kernel/sysrq
-echo o > /proc/sysrq-trigger
-sleep 20
+echo "Image with ${dracut_cpio_params[*]} booted successfully"
+poweroff -f
 EOF
 
-    "$DRACUT" -l --drivers "" \
+    test_dracut \
+        --no-kernel --drivers "" \
+        --modules "test" \
         "${dracut_cpio_params[@]}" \
-        --modules "bash base" \
         --include "$tdir/init.sh" /lib/dracut/hooks/emergency/00-init.sh \
-        --no-hostonly --no-hostonly-cmdline \
-        "$tdir/initramfs" \
-        || return 1
+        --install "poweroff" \
+        "$tdir/initramfs"
 
     "$testdir"/run-qemu \
-        -device i6300esb -watchdog-action poweroff \
         -daemonize -pidfile "$tdir/vm.pid" \
         -serial "file:$tdir/console.out" \
-        -append "panic=1 oops=panic softlockup_panic=1 loglevel=7 console=ttyS0 rd.shell=1" \
+        -append "panic=1 oops=panic softlockup_panic=1 console=ttyS0 rd.shell=1" \
         -initrd "$tdir/initramfs" || return 1
 
     timeout=120
-- 
cgit v1.2.3