summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <thierry.vignaud@gmail.com>2016-06-23 16:19:26 +0200
committerThierry Vignaud <thierry.vignaud@gmail.com>2016-06-23 16:32:22 +0200
commita10da3c595574b8d8b55a5472439c71d19f68ad9 (patch)
tree649be945e8ea1e4e9e2de6bd463d934079d96296
parent8ce247d9ea31828bd450707d0ff2d305124d13f1 (diff)
downloaddrakx-a10da3c595574b8d8b55a5472439c71d19f68ad9.tar
drakx-a10da3c595574b8d8b55a5472439c71d19f68ad9.tar.gz
drakx-a10da3c595574b8d8b55a5472439c71d19f68ad9.tar.bz2
drakx-a10da3c595574b8d8b55a5472439c71d19f68ad9.tar.xz
drakx-a10da3c595574b8d8b55a5472439c71d19f68ad9.zip
UEFI: do not offer to pick the disk
where to install the bootloader (grub2) as we don't give it to grub2-install, which looks for the ESP anyway
-rw-r--r--perl-install/NEWS3
-rw-r--r--perl-install/any.pm2
-rw-r--r--perl-install/install/NEWS2
3 files changed, 6 insertions, 1 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index 890785b2c..c6f31fa35 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,6 @@
+- drakboot:
+ o do not offer to pick the disk where to install grub2 on UEFI
+
Version 17.42 - 22 June 2016
- drakboot:
diff --git a/perl-install/any.pm b/perl-install/any.pm
index d9039c846..8d804cade 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -411,7 +411,7 @@ sub setupBootloader__general {
list => \@method_choices, format => \&bootloader::method2text },
if_(arch() !~ /ia64/,
{ label => N("Boot device"), val => \$b->{boot}, list => \@boot_devices,
- format => sub { $boot_devices{$_[0]} } },
+ format => sub { $boot_devices{$_[0]} }, disabled => sub { is_uefi() } },
),
{ label => N("Main options"), title => 1 },
{ label => N("Delay before booting default image"), val => \$b->{timeout} },
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 11880b9e8..620db9118 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,5 @@
+- bootloader configuration:
+ o do not offer to pick the disk where to install grub2 on UEFI
- logs:
o fix found kernel names
o log if were running under UEFI