From 9433b6c6ee97c752d41e363aa4a5b69f0e6bc140 Mon Sep 17 00:00:00 2001
From: Markus Schade <markus.schade@hetzner.com>
Date: Thu, 3 Aug 2023 13:32:39 +0200
Subject: [PATCH] Fixup for aarch64 ubuntu multi-ESP support

---
 debconf.functions.sh | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/debconf.functions.sh b/debconf.functions.sh
index 3ed042d..758839c 100644
--- a/debconf.functions.sh
+++ b/debconf.functions.sh
@@ -53,8 +53,14 @@ debconf_set_grub_install_devices() {
   done
   # set install_devices for grub-efi and run dpkg-reconfigure to install grub on all ESPs listed
   if [ "$IAM" == "ubuntu" -a "$IMG_VERSION" -ge 2004 ] && [ "$UEFI" -eq 1 ] && [ -n "$(echo $part)" ]; then
-    debconf_set "grub-efi-$SYSARCH grub-efi/install_devices string ${value::-2}"
-    execute_chroot_command "dpkg-reconfigure -f noninteractive grub-efi-$SYSARCH"
+    local grub_pkg_name
+    if [ "$SYSARCH" == "x86_64" ]; then
+      grub_pkg_name="grub-efi-amd64"
+    else
+      grub_pkg_name="grub-efi-$SYSARCH"
+    fi
+    debconf_set "$grub_pkg_name grub-efi/install_devices string ${value::-2}"
+    execute_chroot_command "dpkg-reconfigure -f noninteractive $grub_pkg_name"
   else
     debconf_set "grub-pc grub-pc/install_devices multiselect ${value::-2}"
   fi