From 860cf9444270a0e2c13e4af0600c01762a0a5930 Mon Sep 17 00:00:00 2001 From: Robbie Harwood Date: Wed, 21 Dec 2022 22:38:05 +0000 Subject: [PATCH] Fix prefix setting with memdisk creation for network boot Signed-off-by: Robbie Harwood --- grub.macros | 6 ++++-- grub2.spec | 5 ++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/grub.macros b/grub.macros index 687f87c..2e232cb 100644 --- a/grub.macros +++ b/grub.macros @@ -387,12 +387,14 @@ 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 ${GRUB_MODULES} \\\ + -d grub-core ${GRUB_MODULES} \\\ -m memdisk.squashfs \\\ + -p /EFI/%{efi_vendor} \\\ --sbat %{4}./sbat.csv \ %{4}./grub-mkimage -O %{1} -o %{3}.orig \\\ - -p /EFI/BOOT -d grub-core ${GRUB_MODULES} \\\ + -d grub-core ${GRUB_MODULES} \\\ -m memdisk.squashfs \\\ + -p /EFI/BOOT \\\ --sbat %{4}./sbat.csv \ %{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}}} \ diff --git a/grub2.spec b/grub2.spec index a3c882d..2d587e3 100644 --- a/grub2.spec +++ b/grub2.spec @@ -17,7 +17,7 @@ Name: grub2 Epoch: 1 Version: 2.06 -Release: 58%{?dist} +Release: 59%{?dist} Summary: Bootloader with support for Linux, Multiboot and more License: GPLv3+ URL: http://www.gnu.org/software/grub/ @@ -531,6 +531,9 @@ mv ${EFI_HOME}/grub.cfg.stb ${EFI_HOME}/grub.cfg %endif %changelog +* Wed Dec 21 2022 Robbie Harwood - 2.06-59 +- Fix prefix setting with memdisk creation for network boot + * Wed Dec 14 2022 Robbie Harwood - 2.06-58 - ppc64le: fix lpar cas5 - Resolves: #2152547