From 82a1548b2eb9ac72cf952db91fb3a61106683113 Mon Sep 17 00:00:00 2001
From: Sandwich <sandwich@archworks.co>
Date: Fri, 2 Jan 2026 15:08:10 +0100
Subject: [PATCH] Align ESP sizing to full 512 MiB

---
 roles/partitioning/defaults/main.yml | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/roles/partitioning/defaults/main.yml b/roles/partitioning/defaults/main.yml
index 3098262..6d972c3 100644
--- a/roles/partitioning/defaults/main.yml
+++ b/roles/partitioning/defaults/main.yml
@@ -19,6 +19,8 @@ partitioning_luks_options: "{{ luks_options }}"
 partitioning_boot_partition_suffix: 1
 partitioning_main_partition_suffix: 2
 partitioning_efi_size_mib: 512
+partitioning_efi_start_mib: 1
+partitioning_efi_end_mib: "{{ (partitioning_efi_start_mib | int) + (partitioning_efi_size_mib | int) }}"
 partitioning_boot_size_mib: 1024
 partitioning_separate_boot: >-
   {{
@@ -51,7 +53,7 @@ partitioning_efi_mountpoint: >-
       else '/boot'
     )
   }}
-partitioning_boot_end_mib: "{{ (partitioning_efi_size_mib | int) + (partitioning_boot_size_mib | int) }}"
+partitioning_boot_end_mib: "{{ (partitioning_efi_end_mib | int) + (partitioning_boot_size_mib | int) }}"
 partitioning_reserved_gb: >-
   {{
     (
@@ -64,13 +66,14 @@ partitioning_layout: >-
     [
       {
         'number': 1,
-        'part_end': (partitioning_efi_size_mib | string) + 'MiB',
+        'part_start': (partitioning_efi_start_mib | string) + 'MiB',
+        'part_end': (partitioning_efi_end_mib | string) + 'MiB',
         'name': 'efi',
         'flags': ['boot', 'esp']
       },
       {
         'number': 2,
-        'part_start': (partitioning_efi_size_mib | string) + 'MiB',
+        'part_start': (partitioning_efi_end_mib | string) + 'MiB',
         'part_end': (partitioning_boot_end_mib | string) + 'MiB',
         'name': 'boot'
       },
@@ -84,13 +87,14 @@ partitioning_layout: >-
     [
       {
         'number': 1,
-        'part_end': (partitioning_efi_size_mib | string) + 'MiB',
+        'part_start': (partitioning_efi_start_mib | string) + 'MiB',
+        'part_end': (partitioning_efi_end_mib | string) + 'MiB',
         'name': 'boot',
         'flags': ['boot', 'esp']
       },
       {
         'number': 2,
-        'part_start': (partitioning_efi_size_mib | string) + 'MiB',
+        'part_start': (partitioning_efi_end_mib | string) + 'MiB',
         'name': 'root'
       }
     ]