From 232ab244ca68343fe99a1d13eff74df4b71243d5 Mon Sep 17 00:00:00 2001
From: Sandwich <sandwich@archworks.co>
Date: Sun, 28 Dec 2025 02:24:33 +0100
Subject: [PATCH] Restore Debian ESP mount layout

---
 roles/configuration/tasks/bootloader.yml | 6 +++++-
 roles/partitioning/tasks/main.yml        | 7 ++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/roles/configuration/tasks/bootloader.yml b/roles/configuration/tasks/bootloader.yml
index 5999b98..41c4413 100644
--- a/roles/configuration/tasks/bootloader.yml
+++ b/roles/configuration/tasks/bootloader.yml
@@ -5,7 +5,11 @@
       vars:
         configuration_use_efibootmgr: "{{ is_rhel | default(false) }}"
         configuration_efi_dir: >-
-          {{ "/boot/efi" if (is_debian | default(false) or is_rhel | default(false)) else "/boot" }}
+          {{
+            "/boot/efi"
+            if (is_rhel | default(false)) or (os | lower in ["ubuntu", "ubuntu-lts"])
+            else "/boot"
+          }}
         configuration_bootloader_id: >-
           {{ "ubuntu" if os | lower in ["ubuntu", "ubuntu-lts"] else os }}
         configuration_efi_vendor: >-
diff --git a/roles/partitioning/tasks/main.yml b/roles/partitioning/tasks/main.yml
index a2ddd78..e15da57 100644
--- a/roles/partitioning/tasks/main.yml
+++ b/roles/partitioning/tasks/main.yml
@@ -492,7 +492,12 @@
 
     - name: Mount boot filesystem
       ansible.posix.mount:
-        path: "{{ '/mnt/boot/efi' if (is_debian | default(false) or is_rhel | default(false)) else '/mnt/boot' }}"
+        path: >-
+          {{
+            '/mnt/boot/efi'
+            if (is_rhel | default(false)) or (os | lower in ['ubuntu', 'ubuntu-lts'])
+            else '/mnt/boot'
+          }}
         src: UUID={{ partitioning_boot_uuid.stdout }}
         fstype: vfat
         state: mounted