mirror of
https://abf.rosa.ru/djam/livecd-tools.git
synced 2025-02-24 08:02:58 +00:00
44 lines
2.4 KiB
Diff
44 lines
2.4 KiB
Diff
From ea28099fff52b8af6f751479e0196d65579cb129 Mon Sep 17 00:00:00 2001
|
|
From: Mikhail Novosyolov <m.novosyolov@rosalinux.ru>
|
|
Date: Sun, 27 Jun 2021 12:03:18 +0300
|
|
Subject: [PATCH 07/12] 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 | 11 +++++++----
|
|
1 file changed, 7 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/imgcreate/live.py b/imgcreate/live.py
|
|
index e6e8121..f1349b0 100644
|
|
--- a/imgcreate/live.py
|
|
+++ b/imgcreate/live.py
|
|
@@ -714,10 +714,13 @@ menu end
|
|
"""
|
|
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),
|
|
+ # XXX grubcd.efi probably should contain EFI arch in its name to make 32 bit EFI possible on x86_64 (?)
|
|
+ # Or will 32 bit shim be able to load 64 bit grub?
|
|
+ ("/usr/share/grub2-efi/grubcd.efi", "/EFI/BOOT/grub%s.efi" % (self.efiarch.lower(),), True),
|
|
("/boot/efi/EFI/*/shimia32.efi", "/EFI/BOOT/BOOTIA32.EFI", False),
|
|
+ # XXX gcdia32.efi does not exist yet in ROSA
|
|
("/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:
|
|
@@ -1098,8 +1101,8 @@ class aarch64LiveImageCreator(LiveImageCreatorBase):
|
|
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),
|
|
+ ("/usr/share/grub2-efi/grubcd.efi", "/EFI/BOOT/grub%s.efi" % (self.efiarch.lower(),), True),
|
|
+ ("/boot/grub2/fonts/unicode.pf2", "/EFI/BOOT/fonts/", True),
|
|
]
|
|
makedirs(isodir+"/EFI/BOOT/fonts/")
|
|
for src, dest, required in files:
|
|
--
|
|
2.31.1
|
|
|