From a6eb9024cf0068e16c58b32179a3c3196f5a1bcf Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Fri, 17 Jun 2022 16:58:34 -0700 Subject: [PATCH] do_bootloader: bootloader is always grub on F37+ 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 --- lib/utils.pm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/utils.pm b/lib/utils.pm index f9d70013..c63b9e2c 100644 --- a/lib/utils.pm +++ b/lib/utils.pm @@ -336,8 +336,9 @@ sub do_bootloader { ofw => get_var("OFW"), @_ ); - # if not postinstall not UEFI and not ofw, syslinux - $args{bootloader} //= ($args{uefi} || $args{postinstall} || $args{ofw}) ? "grub" : "syslinux"; + # if not postinstall, not UEFI, not ofw, and not F37+, 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 # sure we actually did a UEFI boot my $boottag = "bootloader_bios";