From 696df925c6ae0dbcf5b1c77e57df09905970a806 Mon Sep 17 00:00:00 2001
From: Sandwich <sandwich@archworks.co>
Date: Fri, 2 Jan 2026 16:29:24 +0100
Subject: [PATCH] Update LVM swap sizing policy

---
 roles/partitioning/tasks/main.yml | 53 +++++++++++++++++++++----------
 1 file changed, 36 insertions(+), 17 deletions(-)

diff --git a/roles/partitioning/tasks/main.yml b/roles/partitioning/tasks/main.yml
index 420cd38..76d8fd2 100644
--- a/roles/partitioning/tasks/main.yml
+++ b/roles/partitioning/tasks/main.yml
@@ -261,13 +261,37 @@
       vars:
         partitioning_lvm_swap_target_gb: >-
           {{
-            (
-              ((partitioning_vm_memory_effective | float / 1024) > 16.0)
-              | ternary(
-                  (partitioning_vm_memory_effective | float / 2048) | int,
-                  (partitioning_vm_memory_effective | float / 1024)
-                )
-            ) | float
+            [
+              (partitioning_vm_memory_effective | float / 1024),
+              4
+            ] | max | float
+          }}
+        partitioning_lvm_swap_cap_gb: >-
+          {{
+            4
+            + [
+              (partitioning_vm_size_effective | float) - 20,
+              0
+            ] | max
+          }}
+        partitioning_lvm_swap_target_effective_gb: >-
+          {{
+            [
+              partitioning_lvm_swap_target_gb,
+              partitioning_lvm_swap_cap_gb
+            ] | min
+          }}
+        partitioning_lvm_swap_max_gb: >-
+          {{
+            [
+              (
+                (partitioning_vm_size_effective | float)
+                - (partitioning_reserved_gb | float)
+                - (cis_enabled | ternary(7.5, 0))
+                - 4
+              ),
+              0
+            ] | max
           }}
         partitioning_lvm_available_gb: >-
           {{
@@ -275,7 +299,7 @@
               (partitioning_vm_size_effective | float)
               - (partitioning_reserved_gb | float)
               - (cis_enabled | ternary(7.5, 0))
-              - partitioning_lvm_swap_target_gb
+              - partitioning_lvm_swap_target_effective_gb
             ) | float
           }}
         partitioning_lvm_home_gb: >-
@@ -304,15 +328,10 @@
           }}
         partitioning_lvm_swap_gb: >-
           {{
-            ((partitioning_lvm_available_gb | float) < 4)
-            | ternary(
-                (
-                  (partitioning_lvm_available_gb | float)
-                  + (partitioning_lvm_swap_target_gb | float)
-                  - 4
-                ),
-                partitioning_lvm_swap_target_gb
-              )
+            [
+              partitioning_lvm_swap_target_effective_gb,
+              partitioning_lvm_swap_max_gb
+            ] | min | round(2, 'floor')
           }}
         partitioning_lvm_root_full_gb: >-
           {{