From 7cac608b3608649021cef3be9139c0aa9d3d0716 Mon Sep 17 00:00:00 2001
From: Martin Whitaker <mageia@martin-whitaker.me.uk>
Date: Mon, 15 Jun 2020 17:58:02 +0100
Subject: Default to installing EFI bootloader in /EFI/BOOT on removable
 devices.

---
 perl-install/any.pm | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'perl-install/any.pm')

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"),
-- 
cgit v1.2.1