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

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