From ae7135d1d0454154958b69cf9e1b56741b99eef0 Mon Sep 17 00:00:00 2001 From: Mikhail Novosyolov Date: Mon, 18 May 2020 11:14:35 +0300 Subject: [PATCH] grub.efi -> grubcd.efi (as it was in ROSA patches for the old version of livecd-tools) "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." --- 0002-Adapt-Grub-and-Shim-paths-for-ROSA.patch | 4 +++- livecd-tools.spec | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/0002-Adapt-Grub-and-Shim-paths-for-ROSA.patch b/0002-Adapt-Grub-and-Shim-paths-for-ROSA.patch index 5593b51..6c867a0 100644 --- a/0002-Adapt-Grub-and-Shim-paths-for-ROSA.patch +++ b/0002-Adapt-Grub-and-Shim-paths-for-ROSA.patch @@ -3,6 +3,8 @@ From: Mikhail Novosyolov 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(-) @@ -41,7 +43,7 @@ index 739545d..9a57884 100644 + # 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/grub.efi", "/EFI/BOOT/grub%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/") diff --git a/livecd-tools.spec b/livecd-tools.spec index dab201f..95287c7 100644 --- a/livecd-tools.spec +++ b/livecd-tools.spec @@ -10,7 +10,7 @@ Name: livecd-tools Summary: Tools for building live CDs Epoch: 1 Version: 27.1 -Release: 5 +Release: 6 License: GPLv2 Group: System/Base URL: https://github.com/livecd-tools/livecd-tools