Re: grub2 fails to boot on sparc64 systems with GPT partitioning
Control: tags -1 +patch
Hello!
The attached patch by James Clarke fixes the problem.
Could you please include it in the next upload of grub2?
It has already been forwarded upstream [1].
Adrian
> [1] https://lists.gnu.org/archive/html/grub-devel/2019-07/msg00031.html
--
.''`. John Paul Adrian Glaubitz
: :' : Debian Developer - glaubitz@debian.org
`. `' Freie Universitaet Berlin - glaubitz@physik.fu-berlin.de
`- GPG: 62FF 8A75 84E0 2956 9546 0006 7426 3B37 F5B5 F913
>From fdaeef94ff74db77a45ee0bb0df11fc540bcb78c Mon Sep 17 00:00:00 2001
From: James Clarke <jrtc27@jrtc27.com>
Date: Mon, 15 Jul 2019 00:52:07 +0200
Subject: [PATCH] sparc64: Fix BIOS Boot Partition support
Currently, gpt_offset is uninitialised when using a BIOS Boot Partition
but is used unconditionally inside save_blocklists. Instead, ensure it
is always initialised to 0 (note that there is already separate code to
do the equivalent adjustment after we call save_blocklists on this code
path).
This patch has been tested on a T5-2 LDOM.
---
util/setup.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/util/setup.c b/util/setup.c
index 6f88f3cc4..3be88aae1 100644
--- a/util/setup.c
+++ b/util/setup.c
@@ -270,6 +270,9 @@ SETUP (const char *dir,
#ifdef GRUB_SETUP_BIOS
bl.current_segment =
GRUB_BOOT_I386_PC_KERNEL_SEG + (GRUB_DISK_SECTOR_SIZE >> 4);
+#endif
+#ifdef GRUB_SETUP_SPARC64
+ bl.gpt_offset = 0;
#endif
bl.last_length = 0;
@@ -730,7 +733,6 @@ unable_to_embed:
#ifdef GRUB_SETUP_SPARC64
{
grub_partition_t container = root_dev->disk->partition;
- bl.gpt_offset = 0;
if (grub_strstr (container->partmap->name, "gpt"))
bl.gpt_offset = grub_partition_get_start (container);
--
2.22.0
Reply to: