summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorThierry Vignaud <thierry.vignaud@gmail.com>2015-03-30 03:38:32 -0400
committerThomas Backlund <tmb@mageia.org>2015-03-30 15:08:52 +0259
commit9c16709d59d7b6f79fa88fe2765742db2b13ec11 (patch)
tree88a82ab21d74929cb455c5777c656d0aa0891377 /perl-install
parent0f907160598cc726a639fe06d1902f0e0811bb81 (diff)
downloaddrakx-9c16709d59d7b6f79fa88fe2765742db2b13ec11.tar
drakx-9c16709d59d7b6f79fa88fe2765742db2b13ec11.tar.gz
drakx-9c16709d59d7b6f79fa88fe2765742db2b13ec11.tar.bz2
drakx-9c16709d59d7b6f79fa88fe2765742db2b13ec11.tar.xz
drakx-9c16709d59d7b6f79fa88fe2765742db2b13ec11.zip
relax checks for ESP
- match ESP even if already mounted - drop checking if !recovery, it's useless as isESP() and isRecovery() checks for different partition types, etc
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/NEWS1
-rw-r--r--perl-install/fs/mount_point.pm2
-rw-r--r--perl-install/install/NEWS1
3 files changed, 3 insertions, 1 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index 91e9aae6f..e8fb1ee96 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -3,6 +3,7 @@
o fix getting ESP with "use free space":
make sure to not override /boot/EFI mount point with /media/win_X
o make sure to check for existing ESP on all disks
+ o relax checks for ESP
o try to detect recovery partitions on GPT
- stage2:
o revert changes made in 16.70 for a better fix to mga#13894
diff --git a/perl-install/fs/mount_point.pm b/perl-install/fs/mount_point.pm
index e4f4ac1c9..8c9069287 100644
--- a/perl-install/fs/mount_point.pm
+++ b/perl-install/fs/mount_point.pm
@@ -58,7 +58,7 @@ sub suggest_mount_points {
sub suggest_mount_points_always {
my ($fstab) = @_;
- my @ESP = grep { isESP($_) && !$_->{isMounted} && maybeFormatted($_) && !$_->{is_removable} && !isRecovery($_) } @$fstab;
+ my @ESP = grep { isESP($_) && maybeFormatted($_) && !$_->{is_removable} } @$fstab;
if (@ESP) {
$ESP[0]{mntpoint} = "/boot/EFI";
}
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index b7ae2ae30..647b79ecb 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -3,6 +3,7 @@
o fix getting ESP with "use free space":
make sure to not override /boot/EFI mount point with /media/win_X
o make sure to check for existing ESP on all disks
+ o relax checks for ESP
o try to detect recovery partitions on GPT
Version 16.74 - 27 March 2015