From 7ed35a070c3ce3e07ef13f52b1743a9eab82e948 Mon Sep 17 00:00:00 2001
From: Manuel Thalmann <m@nuth.ch>
Date: Fri, 1 Dec 2023 15:59:48 +0100
Subject: [PATCH] Mount NixOS EFI partition to `/boot/efi`

---
 scripts/Common/OS/partition.sh | 3 ++-
 scripts/NixOS/OS/setup.sh      | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/scripts/Common/OS/partition.sh b/scripts/Common/OS/partition.sh
index 87f20cfd..3119407d 100755
--- a/scripts/Common/OS/partition.sh
+++ b/scripts/Common/OS/partition.sh
@@ -8,6 +8,7 @@ OS_DISK="${OS_DISK}";
 BOOT_LABEL="${BOOT_LABEL:-Boot}";
 OS_LABEL="${OS_LABEL:-Linux}";
 SWAP_LABEL="${SWAP_LABEL:-Swap}";
+BOOT_MOUNTPOINT="${BOOT_MOUNTPOINT:-"/boot"}";
 SKIP_FORMAT_EFI="${SKIP_FORMAT_EFI}";
 PARTITION_SCRIPT="${PARTITION_SCRIPT:-"./default-partition.sh"}";
 memory="$(cat /proc/meminfo | awk -F " " '/^MemTotal/ { print $2 }')";
@@ -62,7 +63,7 @@ then
     bootDisk="/dev/disk/by-label/$BOOT_LABEL";
 fi
 
-mount --mkdir "$bootDisk" "$OS_MOUNT_ROOT/boot";
+mount --mkdir "$bootDisk" "$OS_MOUNT_ROOT$BOOT_MOUNTPOINT";
 swapon "/dev/disk/by-label/$SWAP_LABEL";
 
 if command -v extraMounts
diff --git a/scripts/NixOS/OS/setup.sh b/scripts/NixOS/OS/setup.sh
index ed0f6208..33f53f74 100755
--- a/scripts/NixOS/OS/setup.sh
+++ b/scripts/NixOS/OS/setup.sh
@@ -10,6 +10,7 @@ OS_LABEL="${OS_LABEL:-NixOS}";
 OS_MOUNT_ROOT="${NIXOS_MOUNT_ROOT}" \
 OS_DISK="${NIXOS_DISK}" \
 OS_LABEL="${OS_LABEL}" \
+BOOT_MOUNTPOINT="/boot/efi" \
     . "../../Common/OS/partition.sh";
 
 configRoot="$NIXOS_MOUNT_ROOT/etc/nixos";