master: Use standard GRUB image for legacy boot, too

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/src/bricklayer-master b/src/bricklayer-master
index 1be5848642ebb64798a7dcdc7fa6a021b9f2c935..eb6acf89787502f5fd942dd91539f8b33401b8e4 100644 (file)
--- 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