summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorThierry Vignaud <thierry.vignaud@gmail.com>2015-06-30 04:13:15 -0400
committerThierry Vignaud <thierry.vignaud@gmail.com>2016-02-10 23:10:05 +0100
commitc36f5bc526c4f46acce03a5061e7a0e26a867337 (patch)
treed52a011a32731abaa6e3a3f62448f9b58cdfc03f /perl-install
parent6945251db17abf6e8cf2946ec15af5739170b43f (diff)
downloaddrakx-c36f5bc526c4f46acce03a5061e7a0e26a867337.tar
drakx-c36f5bc526c4f46acce03a5061e7a0e26a867337.tar.gz
drakx-c36f5bc526c4f46acce03a5061e7a0e26a867337.tar.bz2
drakx-c36f5bc526c4f46acce03a5061e7a0e26a867337.tar.xz
drakx-c36f5bc526c4f46acce03a5061e7a0e26a867337.zip
check that ESP mount point actually is an ESP
fixing grub2 faillure resulting in draklive-install crash (mga#16246)
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/NEWS1
-rw-r--r--perl-install/fs/partitioning_wizard.pm5
-rw-r--r--perl-install/install/NEWS1
3 files changed, 6 insertions, 1 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index 4eba2289a..4f3c28ff3 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,5 +1,6 @@
- library (for draklive-install):
o check ESP has the right fs type (mga#16246)
+ o check that ESP mount point actually is an ESP
Version 17.16 - 25 January 2016
diff --git a/perl-install/fs/partitioning_wizard.pm b/perl-install/fs/partitioning_wizard.pm
index f79b72718..6290e8ccb 100644
--- a/perl-install/fs/partitioning_wizard.pm
+++ b/perl-install/fs/partitioning_wizard.pm
@@ -71,9 +71,12 @@ Then choose action ``Mount point'' and set it to `/'"), 1) or return;
if (!any { isSwap($_) } @fstab) {
$ok &&= $in->ask_okcancel('', N("You do not have a swap partition.\n\nContinue anyway?"));
}
- if (is_uefi() && !fs::get::has_mntpoint("/boot/EFI", $all_hds)) {
+ if (is_uefi()) {
+ my $part = fs::get::has_mntpoint("/boot/EFI", $all_hds);
+ if (!$part || !isESP($part)) {
$in->ask_warn('', N("You must have a ESP FAT32 partition mounted in /boot/EFI"));
$ok = '';
+ }
}
} until $ok;
1;
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 5f44132c5..ce842148e 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,5 +1,6 @@
- partionning:
o check ESP has the right fs type (mga#16246)
+ o check that ESP mount point actually is an ESP
Version 17.17 - 29 January 2016