From 9e340d74e5196ef9e52a6790330ef68a00b55a57 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <thierry.vignaud@gmail.com>
Date: Thu, 9 Jun 2016 10:51:28 +0200
Subject: refactor for next commit

---
 perl-install/fsedit.pm | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'perl-install/fsedit.pm')

diff --git a/perl-install/fsedit.pm b/perl-install/fsedit.pm
index 024d6f975..d67ce0856 100644
--- a/perl-install/fsedit.pm
+++ b/perl-install/fsedit.pm
@@ -47,11 +47,16 @@ sub init_efi_suggestions {
     return if $done && !$o_force;
     $done++;
 
+    my $mntpoint;
     # only suggests /boot/EFI if there's not already one:
-    return if !is_uefi() || grep { isESP($_) } @$fstab;
-
+    if (is_uefi()) {
+	if (!grep { isESP($_) } @$fstab) {
+	    $mntpoint = { mntpoint => "/boot/EFI", size => MB(100), pt_type => 0xef, ratio => 1, maxsize => MB(300) };
+	}
+    }
+    return if !$mntpoint;
     foreach (values %suggestions) {
-	unshift @$_, { mntpoint => "/boot/EFI", size => MB(100), pt_type => 0xef, ratio => 1, maxsize => MB(300) };
+	unshift @$_, $mntpoint;
     }
 }
 
-- 
cgit v1.2.1