-
-
Notifications
You must be signed in to change notification settings - Fork 11
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
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
- Loading branch information
Showing
2 changed files
with
49 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters