From e3924baec2b257eb30a419426202d671de009216 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <thierry.vignaud@gmail.com>
Date: Mon, 16 Mar 2015 13:12:32 +0100
Subject: suggests /boot/EFI when we already have one

see commit 5fd7be6bb8822a8434dcf667482771b2753a8b8d & mga#15366
---
 perl-install/fs/mount_point.pm | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'perl-install')

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) {
-- 
cgit v1.2.1