From 7a5eab954137666e7ae2a0c4d268712113d37d89 Mon Sep 17 00:00:00 2001
From: Alexander Boettcher <alexander.boettcher@genode-labs.com>
Date: Wed, 26 Oct 2022 14:19:40 +0200
Subject: [PATCH] grub2: make ISO bootable on hardware

With "grub2: update to newer grub2 2.06 version" a regression slipped in
which makes the ISO not bootable on real hardware. The commit reverts to
the previous behaviour, to load the GRUB2 modules after boot later one by
one in the ISO format case.

Fixes #4647
---
 repos/base/ports/grub2.hash | 2 +-
 repos/base/ports/grub2.port | 2 +-
 tool/run/iso.inc            | 5 +++++
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/repos/base/ports/grub2.hash b/repos/base/ports/grub2.hash
index 9bb012cc65..f61905c659 100644
--- a/repos/base/ports/grub2.hash
+++ b/repos/base/ports/grub2.hash
@@ -1 +1 @@
-f15e84afbb47b892ed26a5ae56f5bb038777a3c0
+aae6a9ce3485b9fe5c589817e4cfc80b199d8e11
diff --git a/repos/base/ports/grub2.port b/repos/base/ports/grub2.port
index 8daa867699..7b212d5fa1 100644
--- a/repos/base/ports/grub2.port
+++ b/repos/base/ports/grub2.port
@@ -3,7 +3,7 @@ VERSION   := git
 DOWNLOADS := g2fg.git
 
 URL(g2fg) := https://github.com/alex-ab/g2fg.git
-REV(g2fg) := 7da0601946bd2bb75f4e9c3b56cb18e44b2997a1
+REV(g2fg) := 7fb21d87623a3e511ec755d9a4024e16728937be
 DIR(g2fg) := boot
 
 default: $(DOWNLOADS)
diff --git a/tool/run/iso.inc b/tool/run/iso.inc
index 9170c84f67..1bd59b47f7 100644
--- a/tool/run/iso.inc
+++ b/tool/run/iso.inc
@@ -14,5 +14,10 @@ proc install_iso_bootloader_to_run_dir { } {
 	exec mkdir -p [run_dir]/boot/grub/i386-pc
 	exec cp $grub2_path/boot/grub2/eltorito.img [run_dir]/boot/grub/i386-pc/.
 
+	set filelist [glob -nocomplain $grub2_path/boot/grub2/*.mod]
+	foreach file $filelist {
+		file copy $file [run_dir]/boot/grub/i386-pc/.
+	}
+
 	exec cp [genode_dir]/tool/boot/bender [run_dir]/boot/bender
 }