summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorMartin Whitaker <mageia@martin-whitaker.me.uk>2019-02-01 21:40:29 +0000
committerMartin Whitaker <mageia@martin-whitaker.me.uk>2019-02-01 21:40:29 +0000
commitcb92261b831bee5cc82d24229a48a3e394e594d1 (patch)
tree92704ab5ab2d6fc03007872eb103546790057448 /perl-install
parent1ad89c2e2da6957fd351825b90798c86fdf87dc5 (diff)
downloaddrakx-cb92261b831bee5cc82d24229a48a3e394e594d1.tar
drakx-cb92261b831bee5cc82d24229a48a3e394e594d1.tar.gz
drakx-cb92261b831bee5cc82d24229a48a3e394e594d1.tar.bz2
drakx-cb92261b831bee5cc82d24229a48a3e394e594d1.tar.xz
drakx-cb92261b831bee5cc82d24229a48a3e394e594d1.zip
Don't select default bootloader when building Live ISOs.
This avoids selecting the wrong arch when building on an EFI system.
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/install/NEWS1
-rw-r--r--perl-install/install/any.pm2
2 files changed, 2 insertions, 1 deletions
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};