summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <thierry.vignaud@gmail.com>2016-06-24 02:36:24 +0200
committerThierry Vignaud <thierry.vignaud@gmail.com>2016-06-24 03:10:00 +0200
commit739cebee1eb3b5731d789f916ed3ed945b06865b (patch)
treee01b0c086b3a7c6efe537c32245e5495cac47a48
parentbd822be2a49bb6986c90078262a84fa884aa9fd1 (diff)
downloaddrakx-739cebee1eb3b5731d789f916ed3ed945b06865b.tar
drakx-739cebee1eb3b5731d789f916ed3ed945b06865b.tar.gz
drakx-739cebee1eb3b5731d789f916ed3ed945b06865b.tar.bz2
drakx-739cebee1eb3b5731d789f916ed3ed945b06865b.tar.xz
drakx-739cebee1eb3b5731d789f916ed3ed945b06865b.zip
warn if grub2 is not installed on MBR/ESP
-rw-r--r--perl-install/NEWS1
-rw-r--r--perl-install/any.pm8
-rw-r--r--perl-install/install/NEWS1
3 files changed, 9 insertions, 1 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index 18579d645..9e7793069 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -4,6 +4,7 @@
o add a "Do not touch ESP or MBR" option (mga#18770)
o do not offer to pick the disk where to install grub2 on UEFI
o filter GPT disks w/o a BIOS boot part (mga#18770)
+ o warn if grub2 is not installed on MBR/ESP
Version 17.42 - 22 June 2016
diff --git a/perl-install/any.pm b/perl-install/any.pm
index a096df0e2..a9ea0d3ac 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -635,7 +635,13 @@ sub setupBootloader__grub2 {
{ label => N("Append"), val => \$append },
{ label => N("Video mode"), val => \$vga, list => [ '', Xconfig::resolution_and_depth::bios_vga_modes() ],
format => \&Xconfig::resolution_and_depth::to_string, advanced => 1 },
- { text => N("Do not touch ESP or MBR"), val => \$b->{no_esp_or_mbr}, type => 'bool', advanced => 1 },
+ { text => N("Do not touch ESP or MBR"), val => \$b->{no_esp_or_mbr}, type => 'bool', advanced => 1,
+ validate => sub {
+ $b->{no_esp_or_mbr} and $in->ask_warn(N("Warning"),
+ N("Not installing on ESP or MBR means that the installation is not bootable unless chain loaded from another OS!"));
+ 1;
+ },
+ },
{ text => N("Probe Foreign OS"), val => \$os_prober, type => 'bool' },
]);
if ($res) {
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 9356129c9..6e90fc912 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -2,6 +2,7 @@
o add a "Do not touch ESP or MBR" option (mga#18770)
o do not offer to pick the disk where to install grub2 on UEFI
o filter GPT disks w/o a BIOS boot part (mga#18770)
+ o warn if grub2 is not installed on MBR/ESP
- logs:
o fix found kernel names
o log if were running under UEFI