From 5fd7be6bb8822a8434dcf667482771b2753a8b8d Mon Sep 17 00:00:00 2001
From: Thomas Backlund <tmb@mageia.org>
Date: Thu, 8 Jan 2015 20:51:44 +0159
Subject: we need /boot/EFI on uefi systems

---
 perl-install/fs/any.pm                 | 4 ++--
 perl-install/fs/mount_point.pm         | 3 +--
 perl-install/fs/partitioning_wizard.pm | 4 ++--
 perl-install/fsedit.pm                 | 4 ++--
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/perl-install/fs/any.pm b/perl-install/fs/any.pm
index aeec42935..3021cd534 100644
--- a/perl-install/fs/any.pm
+++ b/perl-install/fs/any.pm
@@ -67,8 +67,8 @@ sub check_hds_boot_and_root {
     my ($all_hds, $fstab) = @_;
     fs::get::root_($fstab) or die "Oops, no root partition";
 
-    if (arch() =~ /ia64/ && !fs::get::has_mntpoint("/boot/efi", $all_hds)) {
-	die N("You must have a FAT partition mounted in /boot/efi");
+    if ( is_uefi() && !fs::get::has_mntpoint("/boot/EFI", $all_hds)) {
+	die N("You must have a ESP FAT32 partition mounted in /boot/EFI");
     }
 }
 
diff --git a/perl-install/fs/mount_point.pm b/perl-install/fs/mount_point.pm
index e56c330c0..c399c7d3b 100644
--- a/perl-install/fs/mount_point.pm
+++ b/perl-install/fs/mount_point.pm
@@ -55,8 +55,7 @@ sub suggest_mount_points_always {
     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) {
-	#- Suggest /boot/efi on ia64.
-	$win[0]{mntpoint} = arch() =~ /ia64/ ? "/boot/efi" : "/media/windows";
+	$win[0]{mntpoint} = "/media/windows";
     } else {
 	my %w; foreach (@win) {
 	    my $v = $w{$_->{device_windobe}}++;
diff --git a/perl-install/fs/partitioning_wizard.pm b/perl-install/fs/partitioning_wizard.pm
index 101d70ccc..fda1e3972 100644
--- a/perl-install/fs/partitioning_wizard.pm
+++ b/perl-install/fs/partitioning_wizard.pm
@@ -64,8 +64,8 @@ Then choose action ``Mount point'' and set it to `/'"), 1) or return;
 	if (!any { isSwap($_) } @fstab) {
 	    $ok &&= $in->ask_okcancel('', N("You do not have a swap partition.\n\nContinue anyway?"));
 	}
-	if (arch() =~ /ia64/ && !fs::get::has_mntpoint("/boot/efi", $all_hds)) {
-	    $in->ask_warn('', N("You must have a FAT partition mounted in /boot/efi"));
+	if ( is_uefi() && !fs::get::has_mntpoint("/boot/EFI", $all_hds)) {
+	    $in->ask_warn('', N("You must have a ESP FAT32 partition mounted in /boot/EFI"));
 	    $ok = '';
 	}
     } until $ok;
diff --git a/perl-install/fsedit.pm b/perl-install/fsedit.pm
index 47cb1c051..99a13f0ef 100644
--- a/perl-install/fsedit.pm
+++ b/perl-install/fsedit.pm
@@ -40,8 +40,8 @@ use fs;
   ],
 );
 foreach (values %suggestions) {
-    if (arch() =~ /ia64/) {
-	@$_ = ({ mntpoint => "/boot/efi", size => MB(50), pt_type => 0xef, ratio => 1, maxsize => MB(150) }, @$_);
+    if ( is_uefi() ) {
+	@$_ = ({ mntpoint => "/boot/EFI", size => MB(100), pt_type => 0xef, ratio => 1, maxsize => MB(300) }, @$_);
     }
 }
 
-- 
cgit v1.2.1