From 735cb64fdd32ac61bc0c57ead163a46e33a66da6 Mon Sep 17 00:00:00 2001
From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 28 May 2021 14:43:41 +0000
Subject: [PATCH] master: Use standard GRUB image for legacy boot, too

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---
 src/bricklayer-master | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/bricklayer-master b/src/bricklayer-master
index 1be5848..eb6acf8 100644
--- a/src/bricklayer-master
+++ b/src/bricklayer-master
@@ -43,17 +43,17 @@ ZSTD_COMPRESSION_LEVEL=22
 
 # Grub modules to install
 GRUB_MODULES=(
-	biosdisk
 	iso9660
 	linux
 	linux16
+	ls
 	normal
 	search
 )
 
-GRUB_INSTALL_MODULES=(
-	"${GRUB_MODULES[@]}"
-	ls
+# The modules will only be installed for legacy boot
+GRUB_BIOS_MODULES=(
+	biosdisk
 )
 
 make_label() {
@@ -138,13 +138,12 @@ make_grub_bios_image() {
 
 	# Create a standalone image
 	if ! in_buildsystem --bind="${tempdir}" \
-			grub-mkstandalone \
-				--verbose \
+			grub-mkimage \
 				--format="${grub_arch}-pc" \
+				--prefix="/boot/grub" \
 				--output="${tempdir}/core.img" \
-				--modules="${GRUB_MODULES[*]}" \
-				--install-modules="${GRUB_INSTALL_MODULES[*]}" \
-				--fonts="" --locales="" --themes=""; then
+				"${GRUB_BIOS_MODULES[@]}" \
+				"${GRUB_MODULES[@]}"; then
 		rm -rf "${tempdir}"
 		return 1
 	fi
-- 
2.47.3