From 3ec1a8ab22812e898cd56ba3aa4ea22a4d01d8af Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Sun, 3 May 2026 16:33:38 +0100 Subject: [PATCH] test: make TEST-86-MULTI-PROFILE-UKI robust against reruns When qemu reboots instead of shutting down after the last iteration, the profile is already set to profile2 but the /root/encrypted.raw is gone so the test fails. Reset the default boot entry at the end of the test to make it robust against reruns. Fixes https://github.com/systemd/systemd/issues/39553 --- test/units/TEST-86-MULTI-PROFILE-UKI.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/test/units/TEST-86-MULTI-PROFILE-UKI.sh b/test/units/TEST-86-MULTI-PROFILE-UKI.sh index 5518cb65614..72fb7b6f554 100755 --- a/test/units/TEST-86-MULTI-PROFILE-UKI.sh +++ b/test/units/TEST-86-MULTI-PROFILE-UKI.sh @@ -64,6 +64,9 @@ elif [[ "$ID" == "profile1" ]]; then elif [[ "$ID" == "profile2" ]]; then grep testprofile2=1 /proc/cmdline rm /root/encrypted.raw + # Reset the default boot entry so a subsequent re-run of the test does not + # boot straight back into @profile2 (where encrypted.raw is now gone) and fail. + bootctl set-default "" else exit 1 fi -- 2.47.3