From 98a59e7c00f43fa167ea2c0640811117ff976f78 Mon Sep 17 00:00:00 2001 From: Thomas Backlund Date: Sat, 11 Jan 2014 04:12:05 +0159 Subject: fs/mount_point: detect and suggest /boot/EFI mount point --- perl-install/fs/mount_point.pm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/perl-install/fs/mount_point.pm b/perl-install/fs/mount_point.pm index 282b28ab6..3fbc65e95 100644 --- a/perl-install/fs/mount_point.pm +++ b/perl-install/fs/mount_point.pm @@ -18,6 +18,7 @@ sub guess_mount_point { '/tmp' => '.X11-unix', '/usr' => 'src', '/var' => 'spool', + '/boot/EFI' => 'EFI/Boot/bootx64.efi', ); my $handle = any::inspect($part, $prefix) or return; @@ -52,8 +53,8 @@ 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"; + #- Suggest /boot/EFI on ia64 and x86_64. + $win[0]{mntpoint} = arch() =~ /ia64|x86_&4/ && (-e "/sys/firmware/efi" ? "/boot/EFI"; } else { my %w; foreach (@win) { my $v = $w{$_->{device_windobe}}++; -- cgit v1.2.1