From 9b6c7b4d612acc1ad8c6f9d573f50993e7e10832 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Wed, 22 Jun 2016 00:44:03 +0200 Subject: do not overwite ESP if not installing on it temporary hack for mga#15583 --- perl-install/NEWS | 1 + perl-install/bootloader.pm | 1 + perl-install/install/NEWS | 1 + 3 files changed, 3 insertions(+) (limited to 'perl-install') 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 -- cgit v1.2.1