From b0640fc82920ab92e943e5e35dd072e016dcd51f Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <thierry.vignaud@gmail.com>
Date: Sat, 2 Jul 2016 15:36:04 +0200
Subject: make clear grub2 is installed on ESP under UEFI

---
 perl-install/NEWS         | 2 ++
 perl-install/any.pm       | 5 +++++
 perl-install/install/NEWS | 3 +++
 3 files changed, 10 insertions(+)

(limited to 'perl-install')

diff --git a/perl-install/NEWS b/perl-install/NEWS
index 6cdbf1c8a..adc03e119 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,5 @@
+- drakboot:
+  o make clear grub2 is installed on ESP under UEFI
 - finish-install:
   o drop reload-dm hack
   o drop gnome-reboot hack
diff --git a/perl-install/any.pm b/perl-install/any.pm
index ba854dad7..9aad51502 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -390,6 +390,10 @@ sub setupBootloader__general {
     $b->{password2} ||= $b->{password} ||= '';
     $::Wizard_title = N("Boot Style Configuration");
 	my (@boot_devices, %boot_devices);
+    if (is_uefi()) {
+	@boot_devices = 'ESP';
+	%boot_devices = (ESP => N("EFI System partition"));
+    } else {
 	foreach (bootloader::allowed_boot_parts($b, $all_hds)) {
 	    my $dev = "/dev/$_->{device}";
 	    push @boot_devices, $dev;
@@ -400,6 +404,7 @@ sub setupBootloader__general {
 	    }
 	    $boot_devices{$dev} = $name ? "$dev ($name)" : $dev;
 	}
+    }
 
 	$in->ask_from_({ #messages => N("Bootloader main options"),
 			 title => N("Bootloader main options"),
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index a6e29f744..a29d56209 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,6 @@
+- bootloader configuration:
+  o make clear grub2 is installed on ESP under UEFI
+
 Version 17.47 - 30 June 2016
 
 - partionning:
-- 
cgit v1.2.1