From ed2ea315f6b48700373087e259223e5761069fac Mon Sep 17 00:00:00 2001
From: Christian Pointner <equinox@spreadspace.org>
Date: Wed, 30 Jun 2021 00:13:57 +0200
Subject: ubuntu installer: add support for software raid (WIP)

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

(limited to 'roles/installer/debian/preseed/templates')

diff --git a/roles/installer/debian/preseed/templates/partman_config.j2 b/roles/installer/debian/preseed/templates/partman_config.j2
index 9f8c7dcd..39003864 100644
--- a/roles/installer/debian/preseed/templates/partman_config.j2
+++ b/roles/installer/debian/preseed/templates/partman_config.j2
@@ -48,14 +48,14 @@ d-i partman-auto/method string lvm
 d-i partman-auto/expert_recipe string                                                                             \
       ansible ::                                                                                                  \
 {% if (install_cooked.efi | default(false)) %}
-{%   set efi_esp_size_mb = (((preseed_efi_esp_size | default(preseed_efi_esp_size)) | human_to_bytes) / (1024*1024)) | int %}
+{%   set efi_esp_size_mb = ((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" %}
-{%   set swraid_boot_size_mb = (((preseed_swraid_boot_size | default(preseed_swraid_boot_size)) | human_to_bytes) / (1024*1024)) | int %}
+{%   set swraid_boot_size_mb = ((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{ }                                                      \
                       method{ raid }                                                                              \
-- 
cgit v1.2.3