summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Whitaker <mageia@martin-whitaker.me.uk>2020-06-15 17:58:02 +0100
committerMartin Whitaker <mageia@martin-whitaker.me.uk>2020-06-16 17:22:01 +0100
commit7cac608b3608649021cef3be9139c0aa9d3d0716 (patch)
treed31c5a4daad014e39d7a42a41feae029c522658a
parent49a85ac103ec3e275941535e31daf6e90b03a202 (diff)
downloaddrakx-7cac608b3608649021cef3be9139c0aa9d3d0716.tar
drakx-7cac608b3608649021cef3be9139c0aa9d3d0716.tar.gz
drakx-7cac608b3608649021cef3be9139c0aa9d3d0716.tar.bz2
drakx-7cac608b3608649021cef3be9139c0aa9d3d0716.tar.xz
drakx-7cac608b3608649021cef3be9139c0aa9d3d0716.zip
Default to installing EFI bootloader in /EFI/BOOT on removable devices.
-rw-r--r--perl-install/any.pm8
1 files changed, 7 insertions, 1 deletions
diff --git a/perl-install/any.pm b/perl-install/any.pm
index 93d5eadd6..13d77d680 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -209,6 +209,12 @@ sub setupBootloaderBefore {
splash => $splash,
quiet => $quiet);
+ if (is_uefi()) {
+ if (my @esp = grep { $_->{mntpoint} eq '/boot/EFI' } @$fstab) {
+ $bootloader->{removable} = $esp[0]{is_removable};
+ }
+ }
+
$bootloader->{keytable} ||= keyboard::keyboard2kmap($keyboard);
log::l("setupBootloaderBefore end");
}
@@ -497,7 +503,7 @@ sub setupBootloader__refind {
my $already_installed = $already_in_refind || $already_in_default;
my $update_esp = !$already_installed;
- my $as_default = $already_in_default;
+ my $as_default = $already_in_default || $b->{removable};
$in->ask_from_(
{
title => N("Bootloader Configuration"),