Fix 'actions' ordering after last commit
I merged the previous commit before realizing the ordering was wrong. All other 'actions' lines have to come *before* the one that adds 'reboot', because one of the conditions for that is whether @actions is populated - basically, if we're taking any actions, we also have to reboot afterwards. If we add an action *after* that line (but no actions were added before that line), we'll do it but then not reboot and the test will break. Signed-off-by: Adam Williamson <awilliam@redhat.com>
This commit is contained in:
parent
8d7be9a227
commit
36181eea76
@ -138,13 +138,13 @@ sub run {
|
||||
# memcheck test doesn't need to reboot at all. Rebooting from GUI
|
||||
# for lives is unreliable. And if we're already doing something
|
||||
# else at a console, we may as well reboot from there too
|
||||
push (@actions, 'reboot') if (!get_var("MEMCHECK") && (get_var("LIVE") || @actions));
|
||||
# Patch for https://bugzilla.redhat.com/show_bug.cgi?id=1817004
|
||||
# Allow ppc64le Silverblue to boot after install
|
||||
if ((get_var("ARCH") eq 'ppc64le') && \
|
||||
(get_var("SUBVARIANT") eq "Silverblue")) {
|
||||
push (@actions, 'grubregen');
|
||||
}
|
||||
push (@actions, 'reboot') if (!get_var("MEMCHECK") && (get_var("LIVE") || @actions));
|
||||
# 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
|
||||
|
Loading…
Reference in New Issue
Block a user