Blame SOURCES/0239-Don-t-guess-boot-efi-as-on-ppc-machines.patch

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