From 9f3d638381dac47b90db8d22b5eedb1f6751ca16 Mon Sep 17 00:00:00 2001
From: Sandwich <sandwich@archworks.co>
Date: Thu, 31 Oct 2024 20:07:40 +0100
Subject: [PATCH] Improve the root lv size calculations, still not perfect on
 bigger disk and ram sizes

---
 roles/partitioning/tasks/main.yml | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/roles/partitioning/tasks/main.yml b/roles/partitioning/tasks/main.yml
index e34b764..e62f316 100644
--- a/roles/partitioning/tasks/main.yml
+++ b/roles/partitioning/tasks/main.yml
@@ -45,22 +45,23 @@
       loop:
         - lv: root
           size: >-
-            {{ ((cis | lower == 'true') | ternary(
-                (((vm_size | float - ((vm_memory | float / 1024 >= 16.0) | ternary(
+            {{ (
+                (vm_size | float -
+                 ((vm_memory | float / 1024 >= 16.0) | ternary(
                     (vm_memory | float / 2048) | int,
                     [vm_memory | float / 1024, 4.0] | max
-                )) - 0.5 - 7.5) > 12.0) | ternary(
-                    (vm_size | float * 0.4) | round(0, 'ceil'),
-                    vm_size | float - ((vm_memory | float / 1024 >= 16.0) | ternary(
-                        (vm_memory | float / 2048) | int,
-                        [vm_memory | float / 1024, 4.0] | max
-                    )) - 0.5 - 7.5
-                )),
-                vm_size | float - ((vm_memory | float / 1024 >= 16.0) | ternary(
+                 )) - 0.5 -
+                 (cis | bool | ternary(0, 7.5))
+                ) > 12.0
+            ) | ternary(
+                (vm_size | float * 0.4) | round(0, 'ceil'),
+                vm_size | float -
+                ((vm_memory | float / 1024 >= 16.0) | ternary(
                     (vm_memory | float / 2048) | int,
                     [vm_memory | float / 1024, 4.0] | max
-                )) - 0.5
-            )) | string + 'G' }}
+                )) - 0.5 -
+                (cis | bool | ternary(7.5, 0))
+            ) | string + 'G' }}
 
         - lv: swap
           size: >-