From 26dc8b9c6247f96fc047ad9a6408fad8cf7814b8 Mon Sep 17 00:00:00 2001
From: Christian Pointner <equinox@spreadspace.org>
Date: Fri, 2 Jul 2021 14:03:42 +0200
Subject: harmonize variable names used by debian/preseed installer role

---
 .../templates/preseed_debian-stretch.cfg.j2        | 30 +++++++++++-----------
 1 file changed, 15 insertions(+), 15 deletions(-)

(limited to 'roles/installer/debian/preseed/templates/preseed_debian-stretch.cfg.j2')

diff --git a/roles/installer/debian/preseed/templates/preseed_debian-stretch.cfg.j2 b/roles/installer/debian/preseed/templates/preseed_debian-stretch.cfg.j2
index f5227e54..172f1879 100644
--- a/roles/installer/debian/preseed/templates/preseed_debian-stretch.cfg.j2
+++ b/roles/installer/debian/preseed/templates/preseed_debian-stretch.cfg.j2
@@ -2,15 +2,15 @@
 #  spreadspace preseed file for Debian stretch based machines
 #########################################################################
 
-d-i debian-installer/language string {{ preseed_language }}
-d-i debian-installer/country string {{ preseed_country }}
-d-i debian-installer/locale string {{ preseed_locales | first }}
-d-i localechooser/preferred-locale string {{ preseed_locales | first }}
-d-i localechooser/supported-locales multiselect {{ preseed_locales | join(', ') }}
+d-i debian-installer/language string {{ debian_preseed_language }}
+d-i debian-installer/country string {{ debian_preseed_country }}
+d-i debian-installer/locale string {{ debian_preseed_locales | first }}
+d-i localechooser/preferred-locale string {{ debian_preseed_locales | first }}
+d-i localechooser/supported-locales multiselect {{ debian_preseed_locales | join(', ') }}
 
-d-i keyboard-configuration/xkb-keymap select {{ preseed_keyboard_layout }}
-d-i keyboard-configuration/layoutcode string {{ preseed_keyboard_layout }}
-d-i keyboard-configuration/variantcode string {{ preseed_keyboard_variant }}
+d-i keyboard-configuration/xkb-keymap select {{ debian_preseed_keyboard_layout }}
+d-i keyboard-configuration/layoutcode string {{ debian_preseed_keyboard_layout }}
+d-i keyboard-configuration/variantcode string {{ debian_preseed_keyboard_variant }}
 
 d-i hw-detect/load_firmware boolean false
 
@@ -47,24 +47,24 @@ d-i passwd/root-password-again password this-very-very-secure-password-will-be-r
 
 
 d-i clock-setup/utc boolean true
-d-i time/zone string {{ preseed_timezone }}
+d-i time/zone string {{ debian_preseed_timezone }}
 d-i clock-setup/ntp boolean false
 
 
-{% if not preseed_manual_partitioning %}
+{% if not debian_preseed_manual_partitioning %}
 {% include 'partman_config.j2' %}
 {% endif %}
 
 
-{% if preseed_kernel_image is defined %}
-d-i base-installer/kernel/image string {{ preseed_kernel_image }}
+{% if debian_preseed_kernel_image is defined %}
+d-i base-installer/kernel/image string {{ debian_preseed_kernel_image }}
 {% endif %}
 
 d-i base-installer/install-recommends boolean false
 d-i apt-setup/security_host string {{ apt_repo_providers[apt_repo_provider].debian_security.host }}
 d-i apt-setup/security_path string {{ apt_repo_providers[apt_repo_provider].debian_security.path }}
 
-tasksel tasksel/first multiselect {{ preseed_install_tasks | join(', ') }}
+tasksel tasksel/first multiselect {{ debian_preseed_install_tasks | join(', ') }}
 d-i pkgsel/include string openssh-server {{ python_basename }} {{ python_basename }}-apt
 d-i pkgsel/upgrade select safe-upgrade
 popularity-contest popularity-contest/participate boolean false
@@ -76,10 +76,10 @@ d-i preseed/late_command string \
     lvremove -f {{ host_name }}/dummy; \
     in-target bash -c "apt-get update -q && apt-get full-upgrade -y -q"; \
     in-target bash -c "sed -e 's/^allow-hotplug/auto/' -i /etc/network/interfaces"; \
-{% if preseed_force_net_ifnames_policy is defined %}
+{% if debian_preseed_force_net_ifnames_policy is defined %}
     mkdir -p /target/etc/systemd/network; \
     in-target bash -c "echo '[Link]' > /etc/systemd/network/90-namepolicy.link"; \
-    in-target bash -c "echo 'NamePolicy={{ preseed_force_net_ifnames_policy }}' >> /etc/systemd/network/90-namepolicy.link"; \
+    in-target bash -c "echo 'NamePolicy={{ debian_preseed_force_net_ifnames_policy }}' >> /etc/systemd/network/90-namepolicy.link"; \
     in-target bash -c "update-initramfs -u"; \
 {% endif %}
     in-target bash -c "passwd -d root && passwd -l root"; \
-- 
cgit v1.2.3