c78952
From 351799d9310a4bec23ed4074444780c2a35435fd Mon Sep 17 00:00:00 2001
32e67a
From: Peter Jones <pjones@redhat.com>
32e67a
Date: Thu, 20 Apr 2017 13:29:06 -0400
31cddd
Subject: [PATCH] Don't guess /boot/efi/ as HFS+ on ppc machines in
6f1e3d
 grub-install
32e67a
6f1e3d
This should never be trying this, and since we've consolidated the
6f1e3d
grubenv to always be on /boot/efi/EFI/fedora/, this code causes it to
6f1e3d
always make the wrong decision.
32e67a
32e67a
Resolves: rhbz#1484474
32e67a
32e67a
Signed-off-by: Peter Jones <pjones@redhat.com>
32e67a
---
32e67a
 util/grub-install.c | 12 +-----------
32e67a
 1 file changed, 1 insertion(+), 11 deletions(-)
32e67a
32e67a
diff --git a/util/grub-install.c b/util/grub-install.c
ec4acb
index cd84a72b97b..48f2abc3ea5 100644
32e67a
--- a/util/grub-install.c
32e67a
+++ b/util/grub-install.c
6f1e3d
@@ -1159,18 +1159,8 @@ main (int argc, char *argv[])
32e67a
 	  char *d;
32e67a
 
32e67a
 	  is_guess = 1;
32e67a
-	  d = grub_util_path_concat (2, bootdir, "macppc");
32e67a
-	  if (!grub_util_is_directory (d))
32e67a
-	    {
32e67a
-	      free (d);
32e67a
-	      d = grub_util_path_concat (2, bootdir, "efi");
32e67a
-	    }
32e67a
 	  /* Find the Mac HFS(+) System Partition.  */
32e67a
-	  if (!grub_util_is_directory (d))
32e67a
-	    {
32e67a
-	      free (d);
32e67a
-	      d = grub_util_path_concat (2, bootdir, "EFI");
32e67a
-	    }
32e67a
+	  d = grub_util_path_concat (2, bootdir, "macppc");
32e67a
 	  if (!grub_util_is_directory (d))
32e67a
 	    {
32e67a
 	      free (d);