From d90144d2190009f8bd121cb8f773a9209500f034 Mon Sep 17 00:00:00 2001
From: Christian Pointner <equinox@spreadspace.org>
Date: Sat, 1 Jan 2022 20:19:56 +0100
Subject: in-place variable cooking

---
 roles/installer/debian/preseed/templates/partman_config.j2 | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'roles/installer/debian/preseed/templates/partman_config.j2')

diff --git a/roles/installer/debian/preseed/templates/partman_config.j2 b/roles/installer/debian/preseed/templates/partman_config.j2
index 77bc0f8b..70d218a7 100644
--- a/roles/installer/debian/preseed/templates/partman_config.j2
+++ b/roles/installer/debian/preseed/templates/partman_config.j2
@@ -15,7 +15,7 @@ d-i partman-auto-lvm/new_vg_name string {{ host_name }}
 d-i partman-auto-lvm/guided_size string max
 d-i partman-auto-lvm/no_boot boolean true
 
-{% if (install_cooked.efi | default(false)) %}
+{% if (install.efi | default(false)) %}
 d-i partman-efi/non_efi_system boolean true
 d-i partman/choose_label string gpt
 d-i partman/default_label string gpt
@@ -32,29 +32,29 @@ d-i partman-basicfilesystems/choose_label string msdos
 d-i partman-basicfilesystems/default_label string msdos
 {% endif %}
 
-{% set system_lvm_size = install_cooked.system_lvm.size | default(debian_preseed_system_lvm_size_default) %}
-{% set system_lvm_volumes = install_cooked.system_lvm.volumes | default(debian_preseed_system_lvm_volumes_default) %}
+{% set system_lvm_size = install.system_lvm.size | default(debian_preseed_system_lvm_size_default) %}
+{% set system_lvm_volumes = install.system_lvm.volumes | default(debian_preseed_system_lvm_volumes_default) %}
 {# on small disks this probably triggers: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=896826 ... #}
-{#  set system_lvm_reserve = install_cooked.system_lvm.reserve | default(debian_preseed_system_lvm_reserve_default) #}
+{#  set system_lvm_reserve = install.system_lvm.reserve | default(debian_preseed_system_lvm_reserve_default) #}
 {#  set system_lvm_pv_size_min_mb = (((system_lvm_volumes | map(attribute='size') | map('human_to_bytes') | sum) / (1024*1024)) | int) + (((system_lvm_reserve | human_to_bytes) / (1024*1024)) | int) #}
 {# ... so let's go for a 1 MB minimum. #}
 {% set system_lvm_pv_size_min_mb = 1 %}
 
-{% if install_cooked.disks.primary == "software-raid" %}
+{% if install.disks.primary == "software-raid" %}
 d-i partman-auto/method string raid
 {% else %}
 d-i partman-auto/method string lvm
 {% endif %}
 d-i partman-auto/expert_recipe string                                                                             \
       ansible ::                                                                                                  \
-{% if (install_cooked.efi | default(false)) %}
+{% if (install.efi | default(false)) %}
 {%   set efi_esp_size_mb = ((debian_preseed_efi_esp_size | human_to_bytes) / (1024*1024)) | int %}
               {{ efi_esp_size_mb }} {{ efi_esp_size_mb }} {{ efi_esp_size_mb }} fat16                             \
                       $primary{ } $bootable{ }                                                                    \
                       method{ efi } format{ }                                                                     \
               .                                                                                                   \
 {% endif %}
-{% if install_cooked.disks.primary == "software-raid" %}
+{% if install.disks.primary == "software-raid" %}
 {%   set swraid_boot_size_mb = ((debian_preseed_swraid_boot_size | human_to_bytes) / (1024*1024)) | int %}
               {{ swraid_boot_size_mb }} {{ swraid_boot_size_mb }} {{ swraid_boot_size_mb }} raid                  \
                       $lvmignore{ } $primary{ } $bootable{ }                                                      \
-- 
cgit v1.2.3