summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <thierry.vignaud@gmail.com>2017-01-07 14:44:11 +0100
committerThierry Vignaud <thierry.vignaud@gmail.com>2017-01-07 14:44:11 +0100
commit07d75cb4cec18e85ef21a819d5c3dcbc4e269b8d (patch)
tree2d05cfb761ca8f9b18ddde7d8ef07c6c825ffcf5
parentb3479e1896a7ce646c12f4c2db526356c030bc1f (diff)
downloaddrakx-07d75cb4cec18e85ef21a819d5c3dcbc4e269b8d.tar
drakx-07d75cb4cec18e85ef21a819d5c3dcbc4e269b8d.tar.gz
drakx-07d75cb4cec18e85ef21a819d5c3dcbc4e269b8d.tar.bz2
drakx-07d75cb4cec18e85ef21a819d5c3dcbc4e269b8d.tar.xz
drakx-07d75cb4cec18e85ef21a819d5c3dcbc4e269b8d.zip
fix exception when clearing all partitions
it happens on !UEFI (mga#20083)
-rw-r--r--perl-install/NEWS2
-rw-r--r--perl-install/fsedit.pm1
-rw-r--r--perl-install/install/NEWS2
3 files changed, 5 insertions, 0 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index fb3574915..6637bf7fb 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,5 +1,7 @@
- bootloader:
o disable audit logging as it floods the logs
+- diskdrake:
+ o fix exception when clearing all partitions on !UEFI (mga#20083)
- recognize new kernel-4.9 drivers
Version 17.65 - 12 December 2016
diff --git a/perl-install/fsedit.pm b/perl-install/fsedit.pm
index a013cc679..114039baf 100644
--- a/perl-install/fsedit.pm
+++ b/perl-install/fsedit.pm
@@ -51,6 +51,7 @@ sub init_mntpnt_suggestions {
my $mntpoint;
# only suggests /boot/EFI if there's not already one:
+ require fs::any;
if (is_uefi()) {
if (!any { isESP($_) } @$fstab) {
$mntpoint = { mntpoint => "/boot/EFI", size => MB(100), pt_type => 0xef, ratio => 1, maxsize => MB(300) };
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 7696e41a6..0131879ab 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,5 +1,7 @@
- bootloader:
o disable audit logging as it floods the logs
+- partitioning:
+ o fix exception when clearing all partitions on !UEFI (mga#20083)
- recognize new kernel-4.9 drivers
Version 17.68 - 14 December 2016