dcavalca / rpms / grub2

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