mirror of
https://src.fedoraproject.org/rpms/grub2.git
synced 2024-11-28 15:46:53 +00:00
7e98da058f
This change reorganizes and cleanups our patches to reduce the patch number from 314 patches to 187. That's achieved by dropping patches that are later reverted and squashing fixes for earlier patches that introduced features. There are no code changes and the diff with upstream is the same before and after the cleanup. Having fewer patches makes easier to manage the patchset and also will ease to rebase them on top of the latest grub-2.04 release. Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
41 lines
1.2 KiB
Diff
41 lines
1.2 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Peter Jones <pjones@redhat.com>
|
|
Date: Thu, 20 Apr 2017 13:29:06 -0400
|
|
Subject: [PATCH] Don't guess /boot/efi/ as HFS+ on ppc machines in
|
|
grub-install
|
|
|
|
This should never be trying this, and since we've consolidated the
|
|
grubenv to always be on /boot/efi/EFI/fedora/, this code causes it to
|
|
always make the wrong decision.
|
|
|
|
Resolves: rhbz#1484474
|
|
|
|
Signed-off-by: Peter Jones <pjones@redhat.com>
|
|
---
|
|
util/grub-install.c | 12 +-----------
|
|
1 file changed, 1 insertion(+), 11 deletions(-)
|
|
|
|
diff --git a/util/grub-install.c b/util/grub-install.c
|
|
index a0ad99729fd..16f137ca854 100644
|
|
--- a/util/grub-install.c
|
|
+++ b/util/grub-install.c
|
|
@@ -1159,18 +1159,8 @@ main (int argc, char *argv[])
|
|
char *d;
|
|
|
|
is_guess = 1;
|
|
- d = grub_util_path_concat (2, bootdir, "macppc");
|
|
- if (!grub_util_is_directory (d))
|
|
- {
|
|
- free (d);
|
|
- d = grub_util_path_concat (2, bootdir, "efi");
|
|
- }
|
|
/* Find the Mac HFS(+) System Partition. */
|
|
- if (!grub_util_is_directory (d))
|
|
- {
|
|
- free (d);
|
|
- d = grub_util_path_concat (2, bootdir, "EFI");
|
|
- }
|
|
+ d = grub_util_path_concat (2, bootdir, "macppc");
|
|
if (!grub_util_is_directory (d))
|
|
{
|
|
free (d);
|