Attachment 8900 Details for Bug 20164 – Proposed fix

Proposed fix

0001-Don-t-suggest-mountpoint-for-ESP-when-doing-a-legacy.patch (text/plain), 998 bytes, created by Martin Whitaker on 2017-01-27 22:29:22 CET

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Whitaker

Created: 2017-01-27 22:29:22 CET

Size: 998 bytes

patch

obsolete

>From b83beb00be7eea76988f4b4b8402ebb99b98b88c Mon Sep 17 00:00:00 2001
>From: Martin Whitaker <mageia@martin-whitaker.me.uk>
>Date: Fri, 27 Jan 2017 21:18:06 +0000
>Subject: [PATCH] Don't suggest mountpoint for ESP when doing a legacy boot
> install (mga#20164).
>
>When doing a UEFI install, we add a fstab entry to mount the ESP on
>/boot/EFI. This is neither required nor desirable when doing a legacy
>boot install, even if an ESP is present on the disk.
>
>diff --git a/perl-install/fs/mount_point.pm b/perl-install/fs/mount_point.pm
>index 9263d69..ead8ee0 100644
>--- a/perl-install/fs/mount_point.pm
>+++ b/perl-install/fs/mount_point.pm
>@@ -58,7 +58,7 @@ sub suggest_mount_points {
> sub suggest_mount_points_always {
>     my ($fstab) = @_;
> 
>-    my @ESP = grep { isESP($_) && maybeFormatted($_) && !$_->{is_removable} } @$fstab;
>+    my @ESP = grep { is_uefi() && isESP($_) && maybeFormatted($_) && !$_->{is_removable} } @$fstab;
>     if (@ESP) {
> 	$ESP[0]{mntpoint} = "/boot/EFI";
>     }
>-- 
>2.10.2
>

From b83beb00be7eea76988f4b4b8402ebb99b98b88c Mon Sep 17 00:00:00 2001
From: Martin Whitaker <mageia@martin-whitaker.me.uk>
Date: Fri, 27 Jan 2017 21:18:06 +0000
Subject: [PATCH] Don't suggest mountpoint for ESP when doing a legacy boot
 install (mga#20164).

When doing a UEFI install, we add a fstab entry to mount the ESP on
/boot/EFI. This is neither required nor desirable when doing a legacy
boot install, even if an ESP is present on the disk.

diff --git a/perl-install/fs/mount_point.pm b/perl-install/fs/mount_point.pm
index 9263d69..ead8ee0 100644
--- a/perl-install/fs/mount_point.pm
+++ b/perl-install/fs/mount_point.pm
@@ -58,7 +58,7 @@ sub suggest_mount_points {
 sub suggest_mount_points_always {
     my ($fstab) = @_;

-    my @ESP = grep { isESP($_) && maybeFormatted($_) && !$_->{is_removable} } @$fstab;
+    my @ESP = grep { is_uefi() && isESP($_) && maybeFormatted($_) && !$_->{is_removable} } @$fstab;
     if (@ESP) {
 	$ESP[0]{mntpoint} = "/boot/EFI";
     }
-- 
2.10.2

Actions: View

Attachments on bug 20164: 8891 | 8900