mirror of
https://abf.rosa.ru/djam/livecd-tools.git
synced 2025-02-24 08:02:58 +00:00
ae7135d1d0
"Fri Jan 18 06:24:57 UTC 2013 - mchang@suse.com - ship a Secure Boot UEFI compatible bootloader (fate#314485). - update for cdrom boot support. - grub2-cdpath.patch: fix the grub.cfg not found when booting from optical disk. - grubcd.efi: the efi image used for optial disk booting, with reduced size and $prefix set to /EFI/BOOT."
53 lines
2.3 KiB
Diff
53 lines
2.3 KiB
Diff
From ed8c961cedfc7f790e33b2cbfdcadaab322daa8b Mon Sep 17 00:00:00 2001
|
|
From: Mikhail Novosyolov <m.novosyolov@rosalinux.ru>
|
|
Date: Sun, 17 May 2020 17:12:22 +0300
|
|
Subject: [PATCH] Adapt Grub and Shim paths for ROSA
|
|
|
|
grubcd.efi: the efi image used for optial disk booting, with reduced size and $prefix set to /EFI/BOOT
|
|
|
|
---
|
|
imgcreate/live.py | 14 ++++++++------
|
|
1 file changed, 8 insertions(+), 6 deletions(-)
|
|
|
|
diff --git a/imgcreate/live.py b/imgcreate/live.py
|
|
index 739545d..9a57884 100644
|
|
--- a/imgcreate/live.py
|
|
+++ b/imgcreate/live.py
|
|
@@ -241,7 +241,7 @@ class LiveImageCreatorBase(LoopImageCreator):
|
|
|
|
def _generate_efiboot(self, isodir):
|
|
"""Generate EFI boot images."""
|
|
- if not glob.glob(self._instroot+"/boot/efi/EFI/*/shim.efi"):
|
|
+ if not glob.glob(self._instroot+"/boot/efi/EFI/*/BOOT*.efi"):
|
|
logging.error("Missing shim.efi, skipping efiboot.img creation.")
|
|
return
|
|
|
|
@@ -720,7 +720,7 @@ menu end
|
|
def efiarch(self):
|
|
if not self._efiarch:
|
|
# for most things, we want them named boot$efiarch
|
|
- efiarch = {"i386": "IA32", "x86_64": "X64"}
|
|
+ efiarch = {"i386": "ia32", "x86_64": "x64"}
|
|
self._efiarch = efiarch[dnf.rpm.basearch(hawkey.detect_arch())]
|
|
return self._efiarch
|
|
|
|
@@ -733,10 +733,12 @@ menu end
|
|
fonts/unicode.pf2
|
|
"""
|
|
fail = False
|
|
- files = [("/boot/efi/EFI/*/shim.efi", "/EFI/BOOT/BOOT%s.EFI" % (self.efiarch,), True),
|
|
- ("/boot/efi/EFI/*/gcdx64.efi", "/EFI/BOOT/grubx64.efi", True),
|
|
- ("/boot/efi/EFI/*/gcdia32.efi", "/EFI/BOOT/grubia32.efi", False),
|
|
- ("/boot/efi/EFI/*/fonts/unicode.pf2", "/EFI/BOOT/fonts/", True),
|
|
+ # Grub2 uses suffixes in ROSA:
|
|
+ # https://abf.io/import/grub2/blob/rosa2019.1/grub2-Install-signed-images-if-UEFI-Secure-Boot-is-enabled.patch
|
|
+ # /boot/efi/EFI/*/BOOTx64.efi is shim.efi
|
|
+ files = [("/boot/efi/EFI/*/BOOT%s.efi" % (self.efiarch,), "/EFI/BOOT/BOOT%s.EFI" % (self.efiarch,), True),
|
|
+ ("/usr/share/grub2-efi/grubcd.efi", "/EFI/BOOT/grub%s.efi" % (self.efiarch,), True),
|
|
+ ("/boot/grub2/fonts/unicode.pf2", "/EFI/BOOT/fonts/", True),
|
|
]
|
|
makedirs(isodir+"/EFI/BOOT/fonts/")
|
|
for src, dest, required in files:
|
|
--
|
|
2.25.1
|
|
|