mirror of
https://src.fedoraproject.org/rpms/grub2.git
synced 2024-11-28 07:44:52 +00:00
5e72956199
This reverts commit 93004a8494,
because it broke Rawhide. It also tries to fixes BLS ostree
detection to work in chroots (e.g. during installation) by also
checking for /ostree/repo.
41 lines
1.2 KiB
Diff
41 lines
1.2 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Peter Jones <pjones@redhat.com>
|
|
Date: Thu, 20 Apr 2017 13:29:06 -0400
|
|
Subject: [PATCH] Don't guess /boot/efi/ as HFS+ on ppc machines in
|
|
grub-install
|
|
|
|
This should never be trying this, and since we've consolidated the
|
|
grubenv to always be on /boot/efi/EFI/fedora/, this code causes it to
|
|
always make the wrong decision.
|
|
|
|
Resolves: rhbz#1484474
|
|
|
|
Signed-off-by: Peter Jones <pjones@redhat.com>
|
|
---
|
|
util/grub-install.c | 12 +-----------
|
|
1 file changed, 1 insertion(+), 11 deletions(-)
|
|
|
|
diff --git a/util/grub-install.c b/util/grub-install.c
|
|
index 84ed6e88ecb..a2bec7446cb 100644
|
|
--- a/util/grub-install.c
|
|
+++ b/util/grub-install.c
|
|
@@ -1190,18 +1190,8 @@ main (int argc, char *argv[])
|
|
char *d;
|
|
|
|
is_guess = 1;
|
|
- d = grub_util_path_concat (2, bootdir, "macppc");
|
|
- if (!grub_util_is_directory (d))
|
|
- {
|
|
- free (d);
|
|
- d = grub_util_path_concat (2, bootdir, "efi");
|
|
- }
|
|
/* Find the Mac HFS(+) System Partition. */
|
|
- if (!grub_util_is_directory (d))
|
|
- {
|
|
- free (d);
|
|
- d = grub_util_path_concat (2, bootdir, "EFI");
|
|
- }
|
|
+ d = grub_util_path_concat (2, bootdir, "macppc");
|
|
if (!grub_util_is_directory (d))
|
|
{
|
|
free (d);
|