diff options
| author | Christian Pointner <equinox@spreadspace.org> | 2021-07-01 20:32:35 +0200 |
|---|---|---|
| committer | Christian Pointner <equinox@spreadspace.org> | 2021-07-01 20:32:35 +0200 |
| commit | c2d011a50b37ad3e02e965dbb8c8960835165764 (patch) | |
| tree | b27d2691903db5b52ba31adbdcc4f30975c4cb38 /roles/installer/debian/preseed/templates/partman_config.j2 | |
| parent | ch-equinox-* install ddrecsue (diff) | |
| parent | cosmetic changes (diff) | |
Merge branch 'topic/new-ubuntu-installer'
Diffstat (limited to 'roles/installer/debian/preseed/templates/partman_config.j2')
| -rw-r--r-- | roles/installer/debian/preseed/templates/partman_config.j2 | 4 |
1 files changed, 2 insertions, 2 deletions
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 } \ |