From a6a414b9e0d387e1744643b6f261cd13f99b329a Mon Sep 17 00:00:00 2001
From: Tobias Powalowski <tpowa@archlinux.org>
Date: Fri, 11 Aug 2023 08:59:44 +0200
Subject: [PATCH] use EFI/limine for limine

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

diff --git a/usr/lib/archboot/installer/bootloader.sh b/usr/lib/archboot/installer/bootloader.sh
index c759d93d8..9d4b7a190 100644
--- a/usr/lib/archboot/installer/bootloader.sh
+++ b/usr/lib/archboot/installer/bootloader.sh
@@ -432,9 +432,9 @@ _do_limine_uefi() {
         _pacman_error
     fi
     _dialog --no-mouse --infobox "Setting up LIMINE now..." 3 60
-    [[ -d "${_DESTDIR}/${_UEFISYS_MP}/EFI/BOOT" ]] || mkdir -p "${_DESTDIR}/${_UEFISYS_MP}/EFI/BOOT/"
-    cp -f "${_DESTDIR}/usr/share/limine/BOOT${_UEFI_ARCH}.EFI" "${_DESTDIR}/${_UEFISYS_MP}/EFI/BOOT/LIMINE${_UEFI_ARCH}.EFI"
-    _LIMINE_CONFIG="${_DESTDIR}/${_UEFISYS_MP}/EFI/BOOT/limine.cfg"
+    [[ -d "${_DESTDIR}/${_UEFISYS_MP}/EFI/limine" ]] || mkdir -p "${_DESTDIR}/${_UEFISYS_MP}/EFI/limine/"
+    cp -f "${_DESTDIR}/usr/share/limine/BOOT${_UEFI_ARCH}.EFI" "${_DESTDIR}/${_UEFISYS_MP}/EFI/limine/LIMINE${_UEFI_ARCH}.EFI"
+    _LIMINE_CONFIG="${_DESTDIR}/${_UEFISYS_MP}/EFI/limine/limine.cfg"
     cat << CONFEOF > "${_LIMINE_CONFIG}"
     TIMEOUT=5
 
@@ -447,17 +447,19 @@ CONFEOF
         echo "MODULE_PATH=boot:///${_INITRD_UCODE}" >> "${_LIMINE_CONFIG}"
     fi
     echo "MODULE_PATH=boot:///${_INITRD}" >> "${_LIMINE_CONFIG}"
-    if [[ -e "${_DESTDIR}/${_UEFISYS_MP}/EFI/BOOT/limine_${_UEFI_ARCH}.efi" ]]; then
+    if [[ -e "${_DESTDIR}/${_UEFISYS_MP}/EFI/limine/LIMINE${_UEFI_ARCH}.EFI" ]]; then
+
         _BOOTMGR_LABEL="LIMINE"
         _BOOTMGR_LOADER_PATH="/EFI/BOOT/LIMINE${_UEFI_ARCH}.EFI"
         _do_uefi_bootmgr_setup
         mkdir -p "${_DESTDIR}/${_UEFISYS_MP}/EFI/BOOT"
         rm -f "${_DESTDIR}/${_UEFISYS_MP}/EFI/BOOT/BOOT${_UEFI_ARCH}.EFI"
-        cp -f "${_DESTDIR}/${_UEFISYS_MP}/EFI/BOOT/LIMINE${_UEFI_ARCH}.EFI" "${_DESTDIR}/${_UEFISYS_MP}/EFI/BOOT/BOOT${_UEFI_ARCH}.EFI"
+        cp -f "${_DESTDIR}/${_UEFISYS_MP}/EFI/limine/LIMINE${_UEFI_ARCH}.EFI" "${_DESTDIR}/${_UEFISYS_MP}/EFI/BOOT/BOOT${_UEFI_ARCH}.EFI"
         sleep 2
         _dialog --msgbox "You will now be put into the editor to edit:\nlimine.cfg\n\nAfter you save your changes, exit the editor." 8 50
         _geteditor || return 1
         "${_EDITOR}" "${_LIMINE_CONFIG}"
+        cp -f "${_LIMINE_CONFIG}" "${_DESTDIR}/${_UEFISYS_MP}/EFI/BOOT/"
         _do_efistub_copy_to_efisys | _dialog --title " Logging to ${_VC} | ${_LOG} " --gauge "Copying kernel, ucode and initramfs to EFI SYSTEM PARTITION now..." 6 75 0
         _dialog --title " Success " --no-mouse --infobox "LIMINE has been setup successfully." 3 50
         sleep 3