543f21c3be
relevant to the current BLS integration and cause issues in older KIWI versions, which actively force it to be enabled by default (bsc#1233196) * 0002-Add-BLS-support-to-grub-mkconfig.patch * 0003-Add-grub2-switch-to-blscfg.patch * 0007-grub-switch-to-blscfg-adapt-to-openSUSE.patch * 0008-blscfg-reading-bls-fragments-if-boot-present.patch * 0009-10_linux-Some-refinement-for-BLS.patch * 0001-10_linux-Do-not-enable-BLSCFG-on-s390-emu.patch OBS-URL: https://build.opensuse.org/package/show/Base:System/grub2?expand=0&rev=523
31 lines
945 B
Diff
31 lines
945 B
Diff
From 2fccb958910afaaf03cbec1a6b98ad197d088ad4 Mon Sep 17 00:00:00 2001
|
|
From: Robbie Harwood <rharwood@redhat.com>
|
|
Date: Thu, 25 Aug 2022 17:57:55 -0400
|
|
Subject: [PATCH 4/9] 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 7132555df..150ca96f4 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
|
|
--
|
|
2.44.0
|
|
|