From a297a63cce4b8845b10f3f3a31be91ed9ed43378 Mon Sep 17 00:00:00 2001
From: Martin Whitaker <mageia@martin-whitaker.me.uk>
Date: Wed, 17 Jun 2020 09:28:40 +0100
Subject: Default to no os-prober when installing bootloader on a removable
 device.

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

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

diff --git a/perl-install/any.pm b/perl-install/any.pm
index 13d77d680..ed618dc1a 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -137,7 +137,7 @@ sub setupBootloaderBeforeStandalone {
 }
 
 sub setupBootloaderBefore {
-    my ($_do_pkgs, $bootloader, $all_hds, $fstab, $keyboard, $allow_fb, $vga_fb, $splash, $quiet) = @_;
+    my ($do_pkgs, $bootloader, $all_hds, $fstab, $keyboard, $allow_fb, $vga_fb, $splash, $quiet) = @_;
     require bootloader;
 
     #- auto_install backward compatibility
@@ -213,7 +213,12 @@ sub setupBootloaderBefore {
         if (my @esp = grep { $_->{mntpoint} eq '/boot/EFI' } @$fstab) {
             $bootloader->{removable} = $esp[0]{is_removable};
         }
+    } else {
+        if (my $root_part = fs::get::root($fstab)) {
+            $bootloader->{removable} = $root_part->{is_removable};
+        }
     }
+    $do_pkgs->remove('os-prober') if $bootloader->{removable} && $do_pkgs->is_installed('os-prober', '/usr/bin/os-prober');
 
     $bootloader->{keytable} ||= keyboard::keyboard2kmap($keyboard);
     log::l("setupBootloaderBefore end");
-- 
cgit v1.2.1