From 716217b9dcc3722d444868aaa5dfab036829fb2a Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <thierry.vignaud@gmail.com>
Date: Tue, 17 Mar 2015 16:06:41 +0100
Subject: reuse existing ESP under UEFI

---
 perl-install/fs/mount_point.pm | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'perl-install')

diff --git a/perl-install/fs/mount_point.pm b/perl-install/fs/mount_point.pm
index 5e0c8f14b..9b25e5f1d 100644
--- a/perl-install/fs/mount_point.pm
+++ b/perl-install/fs/mount_point.pm
@@ -46,6 +46,12 @@ sub suggest_mount_points {
 	#- try to find other mount points via fstab
 	fs::merge_info_from_fstab($fstab, $handle->{dir}, $uniq, 'loose') if $mnt eq '/';
     }
+    # reuse existing ESP under UEFI:
+    my @ESP = if_(is_uefi(), grep { isESP($_) } @$fstab);
+    if (@ESP) {
+	$ESP[0]{mntpoint} = '/boot/EFI';
+	delete $ESP[0]{unsafeMntpoint};
+    }
     $_->{mntpoint} and log::l("suggest_mount_points: $_->{device} -> $_->{mntpoint}") foreach @$fstab;
 }
 
-- 
cgit v1.2.1