From 82f5820dd4d745be76a2a59a7e95897b71d591d8 Mon Sep 17 00:00:00 2001
From: Robbie Harwood <rharwood@redhat.com>
Date: Aug 25 2022 21:59:45 +0000
Subject: Fix root definition for blscfg in emu


Signed-off-by: Robbie Harwood <rharwood@redhat.com>

---

diff --git a/0282-blscfg-Don-t-root-device-in-emu-builds.patch b/0282-blscfg-Don-t-root-device-in-emu-builds.patch
new file mode 100644
index 0000000..3fe8baf
--- /dev/null
+++ b/0282-blscfg-Don-t-root-device-in-emu-builds.patch
@@ -0,0 +1,27 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Robbie Harwood <rharwood@redhat.com>
+Date: Thu, 25 Aug 2022 17:57:55 -0400
+Subject: [PATCH] blscfg: Don't root device in emu builds
+
+Otherwise, we end up looking for kernel/initrd in /boot/boot which
+doesn't work at all.  Non-emu builds need to be looking in
+($root)/boot/, which is what this is for.
+
+Signed-off-by: Robbie Harwood <rharwood@redhat.com>
+---
+ grub-core/commands/blscfg.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/grub-core/commands/blscfg.c b/grub-core/commands/blscfg.c
+index e907a6a5d2..dbd0899acf 100644
+--- a/grub-core/commands/blscfg.c
++++ b/grub-core/commands/blscfg.c
+@@ -41,7 +41,7 @@ GRUB_MOD_LICENSE ("GPLv3+");
+ 
+ #define GRUB_BLS_CONFIG_PATH "/loader/entries/"
+ #ifdef GRUB_MACHINE_EMU
+-#define GRUB_BOOT_DEVICE "/boot"
++#define GRUB_BOOT_DEVICE ""
+ #else
+ #define GRUB_BOOT_DEVICE "($root)"
+ #endif
diff --git a/grub.patches b/grub.patches
index 0b0f88a..1156a0e 100644
--- a/grub.patches
+++ b/grub.patches
@@ -279,3 +279,4 @@ Patch0278: 0278-squish-don-t-dup-rhgb-quiet-check-mtimes.patch
 Patch0279: 0279-squish-give-up-on-rhgb-quiet.patch
 Patch0280: 0280-squish-BLS-only-write-etc-kernel-cmdline-if-writable.patch
 Patch0281: 0281-ieee1275-implement-vec5-for-cas-negotiation.patch
+Patch0282: 0282-blscfg-Don-t-root-device-in-emu-builds.patch
diff --git a/grub2.spec b/grub2.spec
index 234ec8d..36ae724 100644
--- a/grub2.spec
+++ b/grub2.spec
@@ -17,7 +17,7 @@
 Name:		grub2
 Epoch:		1
 Version:	2.06
-Release:	54%{?dist}
+Release:	55%{?dist}
 Summary:	Bootloader with support for Linux, Multiboot and more
 License:	GPLv3+
 URL:		http://www.gnu.org/software/grub/
@@ -530,6 +530,9 @@ mv ${EFI_HOME}/grub.cfg.stb ${EFI_HOME}/grub.cfg
 %endif
 
 %changelog
+* Thu Aug 25 2022 Robbie Harwood <rharwood@redhat.com> - 2.06-55
+- Fix root definition for blscfg in emu
+
 * Thu Aug 25 2022 Robbie Harwood <rharwood@redhat.com> - 2.06-54
 - gettext to gettext-runtime migration from Jens