From 67070cc3163d53adcfa398ff3034d3ccf48db104 Mon Sep 17 00:00:00 2001 From: Achilleas Koutsou Date: Tue, 4 Mar 2025 17:00:09 +0100 Subject: [PATCH] stages/grub2.inst: fix format for non-x86_64 image When writing the grub2 core image, the format should be set based on the platform. This was accidentally changed to be `i386-pc` for all platforms except when building ISOs. Set the format to the platform and only change it to `i386-pc-eltorito` when building ISOs. --- stages/org.osbuild.grub2.inst | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/stages/org.osbuild.grub2.inst b/stages/org.osbuild.grub2.inst index ecc9d2a8..f6578aec 100755 --- a/stages/org.osbuild.grub2.inst +++ b/stages/org.osbuild.grub2.inst @@ -86,12 +86,11 @@ def core_mkimage(platform: str, prefix: str, options: Dict): # read the partition and its filesystem containing said modules # and the grub configuration [NB: efi systems work differently] + gformat = platform if platform == "i386-pc": modules = ["biosdisk"] - gformat = "i386-pc" else: modules = [] - gformat = "i386-pc" if pt_label in ["dos", "mbr"]: modules += ["part_msdos"]