diff options
| author | Thierry Vignaud <thierry.vignaud@gmail.com> | 2015-03-16 13:12:32 +0100 |
|---|---|---|
| committer | Thomas Backlund <tmb@mageia.org> | 2015-03-20 21:09:36 +0159 |
| commit | e3924baec2b257eb30a419426202d671de009216 (patch) | |
| tree | cddad5751f16354a540ea42cce6fafe1ae8b86e3 | |
| parent | 515ed30f0c4e82e737bf3a5b6933e603762e6f69 (diff) | |
| download | drakx-e3924baec2b257eb30a419426202d671de009216.tar drakx-e3924baec2b257eb30a419426202d671de009216.tar.gz drakx-e3924baec2b257eb30a419426202d671de009216.tar.bz2 drakx-e3924baec2b257eb30a419426202d671de009216.tar.xz drakx-e3924baec2b257eb30a419426202d671de009216.zip | |
suggests /boot/EFI when we already have one
see commit 5fd7be6bb8822a8434dcf667482771b2753a8b8d & mga#15366
| -rw-r--r-- | perl-install/fs/mount_point.pm | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/perl-install/fs/mount_point.pm b/perl-install/fs/mount_point.pm index c399c7d3b..5e0c8f14b 100644 --- a/perl-install/fs/mount_point.pm +++ b/perl-install/fs/mount_point.pm @@ -52,6 +52,10 @@ sub suggest_mount_points { sub suggest_mount_points_always { my ($fstab) = @_; + my @ESP = grep { isESP($_) && !$_->{isMounted} && maybeFormatted($_) && !$_->{is_removable} && !isRecovery($_) } @$fstab; + if (@ESP) { + $ESP[0]{mntpoint} = "/boot/EFI"; + } my @win = grep { isFat_or_NTFS($_) && !$_->{isMounted} && maybeFormatted($_) && !$_->{is_removable} && $_->{pt_type} != 0x12 && !isRecovery($_) } @$fstab; log::l("win parts: ", join ",", map { $_->{device} } @win) if @win; if (@win == 1) { |