From 4cdfe5ab1679bff23cad927a5a337ecaa3bb7050 Mon Sep 17 00:00:00 2001
From: Philip H <2294-pheiduck@users.noreply.gitlab.manjaro.org>
Date: Mon, 19 Jun 2023 18:12:40 +0000
Subject: [PATCH 1/3] systemd-boot: proper UEFI_MOUNT option --path= >
 --esp-path=

---
 lib/util-base.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/util-base.sh b/lib/util-base.sh
index f3c01d0..10ba01c 100644
--- a/lib/util-base.sh
+++ b/lib/util-base.sh
@@ -653,7 +653,7 @@ install_systemd_boot() {
     DIALOG " $_InstUefiBtTitle " --yesno "\n$_InstSystdBBody\n " 0 0 || return 0
     clear
 
-    arch_chroot "bootctl --path=${UEFI_MOUNT} install" 2>$ERR
+    arch_chroot "bootctl --esp-path=${UEFI_MOUNT} install" 2>$ERR
     basestrap ${MOUNTPOINT} systemd-boot-manager
     arch_chroot "sdboot-manage gen" 2>$ERR
     check_for_error "systemd-boot" $?

From 2832e8f1f17c486372a2ce3d7c6f50122019fac8 Mon Sep 17 00:00:00 2001
From: Philip H <2294-pheiduck@users.noreply.gitlab.manjaro.org>
Date: Tue, 20 Jun 2023 08:02:46 +0000
Subject: [PATCH 2/3] fixup: bootctl path

---
 lib/util-base.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/util-base.sh b/lib/util-base.sh
index 10ba01c..20b0b7b 100644
--- a/lib/util-base.sh
+++ b/lib/util-base.sh
@@ -653,7 +653,7 @@ install_systemd_boot() {
     DIALOG " $_InstUefiBtTitle " --yesno "\n$_InstSystdBBody\n " 0 0 || return 0
     clear
 
-    arch_chroot "bootctl --esp-path=${UEFI_MOUNT} install" 2>$ERR
+    arch_chroot "bootctl --esp-path=/efi --boot-path=${UEFI_MOUNT} install" 2>$ERR
     basestrap ${MOUNTPOINT} systemd-boot-manager
     arch_chroot "sdboot-manage gen" 2>$ERR
     check_for_error "systemd-boot" $?

From 41be9596a31be23497197b5bfc41ffdba6e66692 Mon Sep 17 00:00:00 2001
From: Philip H <2294-pheiduck@users.noreply.gitlab.manjaro.org>
Date: Tue, 20 Jun 2023 16:48:12 +0000
Subject: [PATCH 3/3] fixup: bootctl opts

---
 lib/util-base.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/util-base.sh b/lib/util-base.sh
index 20b0b7b..9e03d5c 100644
--- a/lib/util-base.sh
+++ b/lib/util-base.sh
@@ -653,7 +653,7 @@ install_systemd_boot() {
     DIALOG " $_InstUefiBtTitle " --yesno "\n$_InstSystdBBody\n " 0 0 || return 0
     clear
 
-    arch_chroot "bootctl --esp-path=/efi --boot-path=${UEFI_MOUNT} install" 2>$ERR
+    arch_chroot "bootctl --esp-path=${UEFI_MOUNT} --boot-path=/boot install" 2>$ERR
     basestrap ${MOUNTPOINT} systemd-boot-manager
     arch_chroot "sdboot-manage gen" 2>$ERR
     check_for_error "systemd-boot" $?