From 71d5e49c03292c0a0b477266bd208036ac828189 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
 <marmarek@invisiblethingslab.com>
Date: Wed, 25 Dec 2019 00:55:04 +0100
Subject: [PATCH] Setup grubx64.efi directly as a bootloader

Skip shim - we don't support SecureBoot and also Fedora's shim has
hardcoded 'fedora' EFI vendor.

QubesOS/qubes-issues#5529
---
 ...grubx64.efi-directly-as-a-bootloader.patch | 48 +++++++++++++++++++
 anaconda.spec.in                              |  1 +
 2 files changed, 49 insertions(+)
 create mode 100644 0027-Setup-grubx64.efi-directly-as-a-bootloader.patch

diff --git a/0027-Setup-grubx64.efi-directly-as-a-bootloader.patch b/0027-Setup-grubx64.efi-directly-as-a-bootloader.patch
new file mode 100644
index 0000000..4987107
--- /dev/null
+++ b/0027-Setup-grubx64.efi-directly-as-a-bootloader.patch
@@ -0,0 +1,48 @@
+From f2380e56e715f543170faa888bc914491138d95a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
+ <marmarek@invisiblethingslab.com>
+Date: Wed, 25 Dec 2019 00:50:22 +0100
+Subject: [PATCH] Setup grubx64.efi directly as a bootloader
+
+Skip shim - we don't support SecureBoot and also Fedora's shim has
+hardcoded 'fedora' EFI vendor.
+---
+ pyanaconda/bootloader/efi.py | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/pyanaconda/bootloader/efi.py b/pyanaconda/bootloader/efi.py
+index f8dd84a4f..098a69df5 100644
+--- a/pyanaconda/bootloader/efi.py
++++ b/pyanaconda/bootloader/efi.py
+@@ -125,7 +125,7 @@ class EFIBase(object):
+ 
+ class EFIGRUB(EFIBase, GRUB2):
+     """EFI GRUBv2"""
+-    _packages32 = [ "grub2-efi-ia32", "shim-ia32" ]
++    _packages32 = [ "grub2-efi-ia32" ]
+     _packages_common = [ "efibootmgr", "grub2-tools" ]
+     can_dual_boot = False
+     stage2_is_valid_stage1 = False
+@@ -135,7 +135,7 @@ class EFIGRUB(EFIBase, GRUB2):
+ 
+     def __init__(self):
+         super().__init__()
+-        self._packages64 = [ "grub2-efi-x64", "shim-x64" ]
++        self._packages64 = [ "grub2-efi-x64" ]
+ 
+         try:
+             f = open("/sys/firmware/efi/fw_platform_size", "r")
+@@ -150,8 +150,8 @@ class EFIGRUB(EFIBase, GRUB2):
+     @property
+     def _efi_binary(self):
+         if self._is_32bit_firmware:
+-            return "\\shimia32.efi"
+-        return "\\shimx64.efi"
++            return "\\grubx32.efi"
++        return "\\grubx64.efi"
+ 
+     @property
+     def packages(self):
+-- 
+2.21.0
+
diff --git a/anaconda.spec.in b/anaconda.spec.in
index ff2c634..8b2d93e 100644
--- a/anaconda.spec.in
+++ b/anaconda.spec.in
@@ -47,6 +47,7 @@ Patch22: 0023-root_password-remove-ssh-options.patch
 Patch23: 0024-Do-not-mount-pre-existing-partitions-and-do-not-dete.patch
 Patch24: 0025-Set-encrypted-partitioning-by-default.patch
 Patch25: 0026-Set-default-hostname-to-dom0.patch
+Patch26: 0027-Setup-grubx64.efi-directly-as-a-bootloader.patch
 
 # Versions of required components (done so we make sure the buildrequires
 # match the requires versions of things).