From 769a4e1e876e6850c9643d1721e1398474c4b229 Mon Sep 17 00:00:00 2001
From: Tobias Powalowski <tpowa@archlinux.org>
Date: Thu, 5 Sep 2024 11:45:05 +0200
Subject: [PATCH] change uki name to mkinitcpio default name

---
 usr/lib/archboot/installer/bootloader_systemd_services.sh | 4 ++--
 usr/lib/archboot/installer/bootloader_uki.sh              | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/usr/lib/archboot/installer/bootloader_systemd_services.sh b/usr/lib/archboot/installer/bootloader_systemd_services.sh
index 9aa180113..6ba3e3ee9 100644
--- a/usr/lib/archboot/installer/bootloader_systemd_services.sh
+++ b/usr/lib/archboot/installer/bootloader_systemd_services.sh
@@ -14,12 +14,12 @@ Unit=run_ukify.service
 [Install]
 WantedBy=multi-user.target
 CONFEOF
-        cat << CONFEOF > "${_DESTDIR}/etc/systemd/system/run_ukify.service"
+    cat << CONFEOF > "${_DESTDIR}/etc/systemd/system/run_ukify.service"
 [Unit]
 Description=Run systemd ukify
 [Service]
 Type=oneshot
-ExecStart="/usr/lib/systemd/ukify build --config=/etc/ukify.conf --output ${_UEFISYS_MP}/EFI/Linux/archlinux-linux.efi"
+ExecStart="/usr/lib/systemd/ukify build --config=/etc/ukify.conf --output ${_UEFISYS_MP}/EFI/Linux/arch-linux.efi"
 CONFEOF
     ${_NSPAWN} systemctl enable run_ukify.path &>"${_NO_LOG}"
 }
diff --git a/usr/lib/archboot/installer/bootloader_uki.sh b/usr/lib/archboot/installer/bootloader_uki.sh
index 330308614..4ee502070 100644
--- a/usr/lib/archboot/installer/bootloader_uki.sh
+++ b/usr/lib/archboot/installer/bootloader_uki.sh
@@ -24,11 +24,11 @@ CONFEOF
 _uki_install() {
     _uki_autobuild
     _BOOTMGR_LABEL="Arch Linux - Unified Kernel Image"
-    _BOOTMGR_LOADER_PATH="/EFI/Linux/archlinux-linux.efi"
+    _BOOTMGR_LOADER_PATH="/EFI/Linux/arch-linux.efi"
     _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/Linux/archlinux-linux.efi" "${_DESTDIR}/${_UEFISYS_MP}/EFI/BOOT/BOOT${_UEFI_ARCH}.EFI"
+    cp -f "${_DESTDIR}/${_UEFISYS_MP}/EFI/Linux/arch-linux.efi" "${_DESTDIR}/${_UEFISYS_MP}/EFI/BOOT/BOOT${_UEFI_ARCH}.EFI"
     sleep 2
     _progress "100" "Unified Kernel Image has been setup successfully."
     sleep 2
@@ -45,8 +45,8 @@ _uki_uefi() {
     _geteditor || return 1
     "${_EDITOR}" "${_CMDLINE}"
     "${_EDITOR}" "${_UKIFY_CONFIG}"
-    ${_NSPAWN} /usr/lib/systemd/ukify build --config=/etc/ukify.conf --output "${_UEFISYS_MP}"/EFI/Linux/archlinux-linux.efi >>"${_LOG}"
-    if [[ -e "${_DESTDIR}/${_UEFISYS_MP}/EFI/Linux/archlinux-linux.efi" ]]; then
+    ${_NSPAWN} /usr/lib/systemd/ukify build --config=/etc/ukify.conf --output "${_UEFISYS_MP}"/EFI/Linux/arch-linux.efi >>"${_LOG}"
+    if [[ -e "${_DESTDIR}/${_UEFISYS_MP}/EFI/Linux/arch-linux.efi" ]]; then
         _uki_install | _dialog --title " Logging to ${_VC} | ${_LOG} " --gauge "Setting up Unified Kernel Image..." 6 75 0
     else
         _dialog --title " ERROR " --no-mouse --infobox "Setting up Unified Kernel Image failed!" 3 60