From a70baba73f45d49259c6e0bc3bb4306fea7473b6 Mon Sep 17 00:00:00 2001
From: Tobias Powalowski <tpowa@archlinux.org>
Date: Sun, 6 Aug 2023 19:16:23 +0200
Subject: [PATCH] fix GRUB_PREFIX_DIR

---
 usr/lib/archboot/installer/bootloader.sh | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/usr/lib/archboot/installer/bootloader.sh b/usr/lib/archboot/installer/bootloader.sh
index ff20ff3e5..432e3b5e6 100644
--- a/usr/lib/archboot/installer/bootloader.sh
+++ b/usr/lib/archboot/installer/bootloader.sh
@@ -917,7 +917,6 @@ _setup_grub_uefi() {
         sleep 2
     else
         ## Install GRUB
-        _GRUB_PREFIX_DIR="/boot/grub/"
         _progress "10" "Setting up GRUB(2) UEFI..."
         _chroot_mount
         touch /.archboot
@@ -932,7 +931,6 @@ _setup_grub_uefi() {
 
 _setup_grub_uefi_sb() {
     if [[ -n "${_UEFI_SECURE_BOOT}" ]]; then
-        _GRUB_PREFIX_DIR="${_UEFISYS_MP}/EFI/BOOT/"
         _progress "10" "Setting up GRUB(2) UEFI Secure Boot..."
         # generate GRUB with config embeded
         #remove existing, else weird things are happening
@@ -951,6 +949,11 @@ _do_grub_uefi() {
     [[ "${_UEFI_ARCH}" == "X64" ]] && _GRUB_ARCH="x86_64"
     [[ "${_UEFI_ARCH}" == "IA32" ]] && _GRUB_ARCH="i386"
     [[ "${_UEFI_ARCH}" == "AA64" ]] && _GRUB_ARCH="arm64"
+    if [[ -n "${_UEFI_SECURE_BOOT}" ]]; then
+        _GRUB_PREFIX_DIR="${_UEFISYS_MP}/EFI/BOOT/"
+    else
+        _GRUB_PREFIX_DIR="/boot/grub/"
+    fi
     _do_grub_common_before
     _setup_grub_uefi | _dialog --title " Logging to ${_LOG} " --gauge "Setting up GRUB(2) UEFI..." 6 75 0
     _do_grub_config || return 1