From cb92261b831bee5cc82d24229a48a3e394e594d1 Mon Sep 17 00:00:00 2001 From: Martin Whitaker Date: Fri, 1 Feb 2019 21:40:29 +0000 Subject: Don't select default bootloader when building Live ISOs. This avoids selecting the wrong arch when building on an EFI system. --- perl-install/install/NEWS | 1 + perl-install/install/any.pm | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'perl-install') diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index 1cc108c8d..ddb6ae896 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,3 +1,4 @@ +- don't select default bootloader when building Live ISOs - improve exitInstall message (mga#24046) Version 18.9 - 17 Dec 2018 diff --git a/perl-install/install/any.pm b/perl-install/install/any.pm index 13da840ad..8111d10f3 100644 --- a/perl-install/install/any.pm +++ b/perl-install/install/any.pm @@ -625,7 +625,7 @@ sub setPackages { install::pkgs::select_by_package_names($urpm, [ $devel_kernel_pkg ], 1); } - install::pkgs::select_by_package_names_or_die($urpm, default_bootloader(), 1) if !$o->{isUpgrade}; + install::pkgs::select_by_package_names_or_die($urpm, default_bootloader(), 1) if !$o->{isUpgrade} && !$o->{match_all_hardware}; install::pkgs::select_by_package_names_or_die($urpm, ['basesystem'], 1); my $rpmsrate_flags_was_chosen = $o->{rpmsrate_flags_chosen}; -- cgit v1.2.1