srbala/os-autoinst-distri-fedora
1
0
Fork 0
mirror of https://pagure.io/fedora-qa/os-autoinst-distri-fedora.git synced 2024-12-22 02:13:08 +00:00
Code Issues Releases Activity

Regenerate grub.cfg for ppc64le Silverblue to boot (step 2)

Browse Source 
Previous commit same summary had some side effect
solved by this new one.

And avoid a warning in autoinst-log when ABRT var not defined.

Signed-off-by: Michel Normand <normand@linux.vnet.ibm.com>
This commit is contained in:
Michel Normand 2020-04-02 08:53:29 +01:00 committed by adamwill
parent 603ee871c1
commit d384cfed30
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
tests/_do_install_and_reboot.pm
View File

@ -133,17 +133,16 @@ sub run {
# before we actually reboot. let's figure them all out first...
my @actions;
push (@actions, 'consoletty0') if (get_var("ARCH") eq "aarch64");
push (@actions, 'abrt') if (get_var("ABRT") eq "system");
push (@actions, 'abrt') if (get_var("ABRT", '') eq "system");
push (@actions, 'rootpw') if (get_var("INSTALLER_NO_ROOT"));
# Patch for https://bugzilla.redhat.com/show_bug.cgi?id=1817004
# Allow ppc64le Silverblue to boot after install
if (check_var('ARCH', 'ppc64le') && check_var('SUBVARIANT', 'Silverblue')) {
push (@actions, 'grubregen');
}
# 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
# 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