dcavalca / rpms / grub2

Forked from rpms/grub2 3 years ago
Clone

Blame SOURCES/0106-Don-t-guess-boot-efi-as-HFS-on-ppc-machines-in-grub-.patch

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