mirror of
https://abf.rosa.ru/djam/livecd-tools.git
synced 2025-02-24 08:02:58 +00:00
69 lines
3.4 KiB
Diff
69 lines
3.4 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
|
|
Update for 28.0 (Survolog)
|
|
|
|
---
|
|
|
|
diff -ur livecd-tools-livecd-tools-28.0/imgcreate/live.py livecd-tools-livecd-tools-28.0_patched/imgcreate/live.py
|
|
--- livecd-tools-livecd-tools-28.0/imgcreate/live.py 2021-05-08 19:32:33.000000000 +0300
|
|
+++ livecd-tools-livecd-tools-28.0_patched/imgcreate/live.py 2021-05-21 11:29:32.134082591 +0300
|
|
@@ -232,7 +232,7 @@
|
|
|
|
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
|
|
|
|
@@ -704,7 +704,7 @@
|
|
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
|
|
|
|
@@ -717,11 +717,11 @@
|
|
fonts/unicode.pf2
|
|
"""
|
|
fail = False
|
|
- files = [("/boot/efi/EFI/*/shim%s.efi" % (self.efiarch.lower(),), "/EFI/BOOT/BOOT%s.EFI" % (self.efiarch,), True),
|
|
- ("/boot/efi/EFI/*/gcd%s.efi" % (self.efiarch.lower(),), "/EFI/BOOT/grub%s.efi" % (self.efiarch.lower(),), True),
|
|
+ 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/efi/EFI/*/shimia32.efi", "/EFI/BOOT/BOOTIA32.EFI", False),
|
|
("/boot/efi/EFI/*/gcdia32.efi", "/EFI/BOOT/grubia32.efi", False),
|
|
- ("/boot/efi/EFI/*/fonts/unicode.pf2", "/EFI/BOOT/fonts/", True),
|
|
+ ("/boot/grub2/fonts/unicode.pf2", "/EFI/BOOT/fonts/", True),
|
|
]
|
|
makedirs(isodir+"/EFI/BOOT/fonts/")
|
|
for src, dest, required in files:
|
|
@@ -1096,15 +1096,15 @@
|
|
def efiarch(self):
|
|
if not self._efiarch:
|
|
# for most things, we want them named boot$efiarch
|
|
- efiarch = {"aarch64": "AA64"}
|
|
+ efiarch = {"aarch64": "aa64"}
|
|
self._efiarch = efiarch[dnf.rpm.basearch(hawkey.detect_arch())]
|
|
return self._efiarch
|
|
|
|
def __copy_efi_files(self, isodir):
|
|
fail = False
|
|
- files = [("/boot/efi/EFI/*/shim%s.efi" % (self.efiarch.lower(),), "/EFI/BOOT/BOOT%s.EFI" % (self.efiarch,), True),
|
|
- ("/boot/efi/EFI/*/gcd%s.efi" % (self.efiarch.lower(),), "/EFI/BOOT/grub%s.efi" % (self.efiarch.lower(),), True),
|
|
- ("/boot/efi/EFI/*/fonts/unicode.pf2", "/EFI/BOOT/fonts/", True),
|
|
+ files = [("/usr/share/shin/shim%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
|
|
|