From f1c23be4097692508d79edb8b66e68e9e636bbe6 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Tue, 26 Mar 2024 08:29:25 -0700 Subject: [PATCH] Fix #2268505 workaround - move the actions push earlier Oops, all other actions pushes need to happen *before* the reboot action push, or the logic breaks. Signed-off-by: Adam Williamson --- tests/_do_install_and_reboot.pm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/_do_install_and_reboot.pm b/tests/_do_install_and_reboot.pm index 398c7df6..4c5f6c0e 100644 --- a/tests/_do_install_and_reboot.pm +++ b/tests/_do_install_and_reboot.pm @@ -125,6 +125,9 @@ sub run { push(@actions, 'noplymouth'); } } + if (get_var("CANNED") && get_var("UEFI")) { + push(@actions, 'checkefibootmgr') if (get_var("UEFI")); + } # memcheck test doesn't need to reboot at all. Rebooting from GUI # for no-webUI lives is unreliable (webUI lives reboot on "Quit" # just like non-lives). And if we're already doing something @@ -133,9 +136,6 @@ sub run { # check whether install is affected by # https://bugzilla.redhat.com/show_bug.cgi?id=2268505 , # soft fail and work around it if so - if (get_var("CANNED") && get_var("UEFI")) { - push(@actions, 'checkefibootmgr') if (get_var("UEFI")); - } # our approach for taking all these actions doesn't work on VNC # installs, fortunately we don't need any of them in that case # yet, so for now let's just flush the list here if we're VNC