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

---
 .../preseed/templates/preseed_ubuntu-bionic.cfg.j2       | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'roles/installer/debian/preseed/templates/preseed_ubuntu-bionic.cfg.j2')

diff --git a/roles/installer/debian/preseed/templates/preseed_ubuntu-bionic.cfg.j2 b/roles/installer/debian/preseed/templates/preseed_ubuntu-bionic.cfg.j2
index 3f31f66b..a36e3d9d 100644
--- a/roles/installer/debian/preseed/templates/preseed_ubuntu-bionic.cfg.j2
+++ b/roles/installer/debian/preseed/templates/preseed_ubuntu-bionic.cfg.j2
@@ -18,24 +18,24 @@ d-i hw-detect/load_firmware boolean false
 {% if debian_preseed_no_netplan %}
 d-i netcfg/do_not_use_netplan boolean true
 {% endif %}
-d-i netcfg/choose_interface select {{ install_interface | default(network_cooked.primary.name) }}
+d-i netcfg/choose_interface select {{ install_interface | default(network.primary.name) }}
 {% if (install_dhcp | default(false)) %}
 d-i netcfg/disable_dhcp boolean false
 d-i netcfg/disable_autoconfig boolean false
 {% else %}
 d-i netcfg/disable_dhcp boolean true
 d-i netcfg/disable_autoconfig boolean true
-d-i netcfg/get_ipaddress string {{ network_cooked.primary.address | ipaddr('address') }}
-d-i netcfg/get_netmask string {{ network_cooked.primary.address | ipaddr('netmask') }}
-d-i netcfg/get_gateway string {{ network_cooked.primary.gateway }}
-d-i netcfg/get_nameservers string {{ network_cooked.nameservers | join(' ') }}
+d-i netcfg/get_ipaddress string {{ network.primary.address | ipaddr('address') }}
+d-i netcfg/get_netmask string {{ network.primary.address | ipaddr('netmask') }}
+d-i netcfg/get_gateway string {{ network.primary.gateway }}
+d-i netcfg/get_nameservers string {{ network.nameservers | join(' ') }}
 d-i netcfg/confirm_static boolean true
 {% endif %}
 
 d-i netcfg/hostname string {{ host_name }}
 d-i netcfg/get_hostname string {{ host_name }}
-d-i netcfg/domain string {{ network_cooked.domain }}
-d-i netcfg/get_domain string {{ network_cooked.domain }}
+d-i netcfg/domain string {{ network.domain }}
+d-i netcfg/get_domain string {{ network.domain }}
 d-i netcfg/wireless_wep string
 
 
@@ -74,7 +74,7 @@ d-i debian-installer/add-kernel-opts string nosplash
 d-i base-installer/install-recommends boolean false
 d-i apt-setup/security_host string {{ apt_repo_providers[apt_repo_provider].ubuntu.host }}
 d-i apt-setup/security_path string {{ apt_repo_providers[apt_repo_provider].ubuntu.path }}
-{% if install_cooked.arch | default('amd64') == 'amd64' %}
+{% if install.arch | default('amd64') == 'amd64' %}
 d-i apt-setup/multiarch string amd64
 {% endif %}
 
-- 
cgit v1.2.3