dcavalca / rpms / grub2

Forked from rpms/grub2 3 years ago
Clone

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

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