summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorThierry Vignaud <thierry.vignaud@gmail.com>2016-06-22 00:44:03 +0200
committerThierry Vignaud <thierry.vignaud@gmail.com>2016-06-22 02:36:07 +0200
commit9b6c7b4d612acc1ad8c6f9d573f50993e7e10832 (patch)
tree858358fbc363d0999e7e1bfd62c87ad41ed69f41 /perl-install
parent5d85cc4dba16dbf5cd219c21d47677e4b8ad3df8 (diff)
downloaddrakx-9b6c7b4d612acc1ad8c6f9d573f50993e7e10832.tar
drakx-9b6c7b4d612acc1ad8c6f9d573f50993e7e10832.tar.gz
drakx-9b6c7b4d612acc1ad8c6f9d573f50993e7e10832.tar.bz2
drakx-9b6c7b4d612acc1ad8c6f9d573f50993e7e10832.tar.xz
drakx-9b6c7b4d612acc1ad8c6f9d573f50993e7e10832.zip
do not overwite ESP if not installing on it
temporary hack for mga#15583
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/NEWS1
-rw-r--r--perl-install/bootloader.pm1
-rw-r--r--perl-install/install/NEWS1
3 files changed, 3 insertions, 0 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index fc21d2d3f..0f997cde4 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,5 +1,6 @@
- drakboot:
o add support for crypted grub2 passwords
+ o grub2: do not overwite ESP if not installing on it (mga#15583)
o grub2: fix setting default entry when in a submenu (mga#18560)
Version 17.41 - 20 June 2016
diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm
index ef0237323..f1e3f4fb8 100644
--- a/perl-install/bootloader.pm
+++ b/perl-install/bootloader.pm
@@ -1914,6 +1914,7 @@ sub write_grub2_install_sh {
my $boot = $bootloader->{boot};
my @options;
if (is_uefi()) {
+ push @options, qw(--bootloader-id=tmp --no-nvram) if $boot =~ /\d$/;
} else {
@options = $boot =~ /\d$/ ? ('--grub-setup=/bin/true', $boot) : $boot;
}
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 9d7a92e8c..55fb52343 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,5 +1,6 @@
- bootloader configuration:
o add support for crypted grub2 passwords
+ o grub2: do not overwite ESP if not installing on it (mga#15583)
o grub2: fix setting default entry when in a submenu (mga#18560)
Version 17.41 - 20 June 2016