diff --git a/SOURCES/grub.macros b/SOURCES/grub.macros index 945c808..d44eef5 100755 --- a/SOURCES/grub.macros +++ b/SOURCES/grub.macros @@ -393,29 +393,22 @@ mkdir -p memdisk/fonts \ cp %{4}/unicode.pf2 memdisk/fonts \ mksquashfs memdisk memdisk.squashfs -comp xz \ %{4}./grub-mkimage -O %{1} -o %{2}.orig \\\ - -p /EFI/%{efi_vendor} -d grub-core \\\ + -d grub-core \\\ --sbat %{4}./sbat.csv \\\ -m memdisk.squashfs \\\ + -p /EFI/%{efi_vendor} \\\ ${GRUB_MODULES} \ %{4}./grub-mkimage -O %{1} -o %{3}.orig \\\ - -p /EFI/BOOT -d grub-core \\\ + -d grub-core \\\ --sbat %{4}./sbat.csv \\\ -m memdisk.squashfs \\\ + -p /EFI/BOOT \\\ ${GRUB_MODULES} \ %{expand:%%define ___pesign_client_cert %{?___pesign_client_cert}%{!?___pesign_client_cert:%{__pesign_client_cert}}} \ %{?__pesign_client_cert:%{expand:%%define __pesign_client_cert %{___pesign_client_cert}}} \ %{expand:%%{pesign -s -i %%{2}.orig -o %%{2} -a %%{5} -c %%{6} -n %%{7}}} \ %{expand:%%{pesign -s -i %%{3}.orig -o %%{3} -a %%{5} -c %%{6} -n %%{7}}} \ %{nil} -%else -%define efi_mkimage() \ -%{4}./grub-mkimage -O %{1} -o %{2} \\\ - -p /EFI/%{efi_vendor} -d grub-core \\\ - ${GRUB_MODULES} \ -%{4}./grub-mkimage -O %{1} -o %{3} \\\ - -p /EFI/BOOT -d grub-core \\\ - ${GRUB_MODULES} \ -%{nil} %endif %ifarch ppc64le diff --git a/SPECS/grub2.spec b/SPECS/grub2.spec index 707b47f..870605a 100644 --- a/SPECS/grub2.spec +++ b/SPECS/grub2.spec @@ -19,7 +19,7 @@ Name: grub2 Epoch: 1 Version: 2.06 -Release: 92%{?dist}.inferit.3 +Release: 92%{?dist}.inferit.4 Summary: Bootloader with support for Linux, Multiboot and more License: GPLv3+ URL: http://www.gnu.org/software/grub/ @@ -538,6 +538,9 @@ mv ${EFI_HOME}/grub.cfg.stb ${EFI_HOME}/grub.cfg %endif %changelog +* Mon Nov 11 2024 Arkady L. Shane - 1:2.06-92.inferit.4 +- Fix prefix setting with memdisk creation for network boot + * Mon Nov 11 2024 Arkady L. Shane - 1:2.06-92.inferit.3 - Bundle unicode.pf2 with images