From 1ec05389902d185cc2116c4d0c65653a8918e9a9 Mon Sep 17 00:00:00 2001
From: Davide Cavalca <dcavalca@fedoraproject.org>
Date: Tue, 29 Aug 2023 10:35:02 -0400
Subject: [PATCH] Fix up grub in the ESP

---
 make-asahi-installer-package.sh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/make-asahi-installer-package.sh b/make-asahi-installer-package.sh
index c70ed08..f6f11a4 100755
--- a/make-asahi-installer-package.sh
+++ b/make-asahi-installer-package.sh
@@ -67,6 +67,11 @@ mkdir -p "${workdir}/package/esp"
 mv "${workdir}/${imagename}2" "${workdir}/package/boot.img"
 mv "${workdir}/${imagename}3" "${workdir}/package/root.img"
 
+# fix up grub in the ESP
+# https://bugzilla.redhat.com/show_bug.cgi?id=2235692
+sed -i 's:source :configfile :' "${workdir}/package/esp/EFI/fedora/grub.cfg"
+rm "${workdir}/package/esp/EFI/BOOT/grubaa64.efi" "${workdir}/package/esp/EFI/BOOT/grub.cfg"
+
 esp_volume_id="$(file "${workdir}/${imagename}1" | awk -v 'RS=,' '/serial number/ { print $3 }')"
 esp_size="$(stat -c %s "${workdir}/${imagename}1")"
 boot_size="$(stat -c %s "${workdir}/package/boot.img")"