srbala/os-autoinst-distri-fedora
1
0
Fork 0
mirror of https://pagure.io/fedora-qa/os-autoinst-distri-fedora.git synced 2024-11-24 23:03:08 +00:00
Code Issues Releases Activity

do_bootloader: bootloader is always grub on F37+

Browse Source 
Now we've ditched syslinux in Rawhide, we should just always
expect to see grub if release number is > 36.

Signed-off-by: Adam Williamson <awilliam@redhat.com>
This commit is contained in:
Adam Williamson 2022-06-17 16:58:34 -07:00
parent fe6314c8de
commit a6eb9024cf
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/utils.pm
View File

@ -336,8 +336,9 @@ sub do_bootloader {
ofw => get_var("OFW"), ofw => get_var("OFW"),
@_ @_
); );
# if not postinstall not UEFI and not ofw, syslinux # if not postinstall, not UEFI, not ofw, and not F37+, syslinux
$args{bootloader} //= ($args{uefi} || $args{postinstall} || $args{ofw}) ? "grub" : "syslinux"; my $relnum = get_release_number;
$args{bootloader} //= ($args{uefi} || $args{postinstall} || $args{ofw}) || $relnum > 36 ? "grub" : "syslinux";
# we use the firmware-type specific tags because we want to be # we use the firmware-type specific tags because we want to be
# sure we actually did a UEFI boot # sure we actually did a UEFI boot
my $boottag = "bootloader_bios"; my $boottag = "bootloader_bios";