From 9e46a970c68ca4b13b96b44d72efeed05f6bce16 Mon Sep 17 00:00:00 2001
From: Robbie Harwood <rharwood@redhat.com>
Date: Wed, 21 Dec 2022 22:35:22 +0000
Subject: [PATCH] Fix prefix setting with memdisk creation for network boot

Signed-off-by: Robbie Harwood <rharwood@redhat.com>
---
 grub.macros | 9 ++++++---
 grub2.spec  | 5 ++++-
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/grub.macros b/grub.macros
index 1670c06..9591ff0 100644
--- a/grub.macros
+++ b/grub.macros
@@ -416,14 +416,16 @@ 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}}} \
@@ -460,8 +462,9 @@ if [ -x /usr/bin/rpm-sign ]; then				\
 fi								\
 # FIXME: using this prefix is fragile, must be done properly	\
 ./grub-mkimage -O %{1} -o %{2}.orig				\\\
-	-p '/grub2' -d grub-core				\\\
+	-d grub-core						\\\
 	-m memdisk.squashfs					\\\
+	-p '/grub2'						\\\
 	-x %{3}							\\\
 	--appended-signature-size ${APPENDED_SIG_SIZE}		\\\
 	${GRUB_MODULES}						\
diff --git a/grub2.spec b/grub2.spec
index c6babdf..d06732d 100644
--- a/grub2.spec
+++ b/grub2.spec
@@ -17,7 +17,7 @@
 Name:		grub2
 Epoch:		1
 Version:	2.06
-Release:	71%{?dist}
+Release:	72%{?dist}
 Summary:	Bootloader with support for Linux, Multiboot and more
 License:	GPLv3+
 URL:		http://www.gnu.org/software/grub/
@@ -544,6 +544,9 @@ mv ${EFI_HOME}/grub.cfg.stb ${EFI_HOME}/grub.cfg
 %endif
 
 %changelog
+* Wed Dec 21 2022 Robbie Harwood <rharwood@redhat.com> - 2.06-72
+- Fix prefix setting with memdisk creation for network boot
+
 * Mon Dec 19 2022 Robbie Harwood <rharwood@redhat.com> - 2.06-71
 - Attempt to fix eln build