grub2/0192-Don-t-guess-boot-efi-as-HFS-on-ppc-machines-in-grub-.patch

45 lines
1.3 KiB
Diff
Raw Normal View History

From 351799d9310a4bec23ed4074444780c2a35435fd Mon Sep 17 00:00:00 2001
From: Peter Jones <pjones@redhat.com>
Date: Thu, 20 Apr 2017 13:29:06 -0400
Subject: [PATCH 192/238] 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 cd84a72b97b..48f2abc3ea5 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);
--
2.17.0