summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorMartin Whitaker <mageia@martin-whitaker.me.uk>2021-01-30 12:47:04 +0000
committerMartin Whitaker <mageia@martin-whitaker.me.uk>2021-01-30 15:45:58 +0000
commit06d1c46ac4e961ccbe44aef8d162d37b97f50de8 (patch)
tree831c0bf8971606e5239d59732d5ce6ea6584d702 /perl-install
parent6145892681406e5c6370ec1a631aee2e68e1477a (diff)
downloaddrakx-06d1c46ac4e961ccbe44aef8d162d37b97f50de8.tar
drakx-06d1c46ac4e961ccbe44aef8d162d37b97f50de8.tar.gz
drakx-06d1c46ac4e961ccbe44aef8d162d37b97f50de8.tar.bz2
drakx-06d1c46ac4e961ccbe44aef8d162d37b97f50de8.tar.xz
drakx-06d1c46ac4e961ccbe44aef8d162d37b97f50de8.zip
Don't remove os-prober in bootloader setup before user makes choice (mga#28223)
We want to default to no probe when installing onto a removable device. But we shouldn't remove the package before the user makes the choice, because on a live system with no online media it can't be reinstalled if the user overrides the default.
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/NEWS2
-rw-r--r--perl-install/any.pm4
-rw-r--r--perl-install/install/NEWS2
3 files changed, 6 insertions, 2 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index 44f51b42c..653d12335 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,5 @@
+- drakboot: don't remove os-prober before user makes choice (mga#28223)
+
Version 18.42 - 26 January 2021
- updated translations
diff --git a/perl-install/any.pm b/perl-install/any.pm
index 09033d55f..0a2efa1a7 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -218,7 +218,7 @@ sub setupBootloaderBefore {
$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->{default_to_no_probe} = 1 if $bootloader->{removable};
$bootloader->{keytable} ||= keyboard::keyboard2kmap($keyboard);
log::l("setupBootloaderBefore end");
@@ -722,7 +722,7 @@ sub setupBootloader__grub2 {
require network::network; #- to list network profiles
my $vga = Xconfig::resolution_and_depth::from_bios($b->{default_vga});
- my $os_prober = $in->do_pkgs->is_installed('os-prober', '/usr/bin/os-prober');
+ my $os_prober = $in->do_pkgs->is_installed('os-prober', '/usr/bin/os-prober') && !$b->{default_to_no_probe};
my $res = $in->ask_from_(
{
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 3f67ef47d..90a087cdd 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,5 @@
+- bootloader: don't remove os-prober before user makes choice (mga#28223)
+
Version 18.42 - 26 January 2021
- updated translations