From 505e00e334eb30f9d9a71f3d1de6ff3adbedb1da Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Sun, 8 Nov 2020 04:59:39 +0100 Subject: finalize harmonization of desktop and server preseed files --- .../preseed/templates/preseed_ubuntu-focal.cfg.j2 | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) (limited to 'roles/installer/debian/preseed/templates/preseed_ubuntu-focal.cfg.j2') diff --git a/roles/installer/debian/preseed/templates/preseed_ubuntu-focal.cfg.j2 b/roles/installer/debian/preseed/templates/preseed_ubuntu-focal.cfg.j2 index 76f6a045..64fad668 100644 --- a/roles/installer/debian/preseed/templates/preseed_ubuntu-focal.cfg.j2 +++ b/roles/installer/debian/preseed/templates/preseed_ubuntu-focal.cfg.j2 @@ -2,14 +2,16 @@ # spreadspace preseed file for Ubuntu focal based machines ######################################################################### -d-i debian-installer/language string en -d-i debian-installer/country string AT -d-i debian-installer/locale string en_US.UTF-8 -d-i localechooser/preferred-locale string en_US.UTF-8 -d-i localechooser/supported-locales multiselect de_DE.UTF-8, de_AT.UTF-8 +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 localechooser/translation/warn-light boolean true + d-i console-setup/ask_detect boolean false -d-i keyboard-configuration/xkb-keymap select us -d-i keyboard-configuration/layoutcode string us +d-i keyboard-configuration/layoutcode string {{ preseed_keyboard_layout }} +d-i keyboard-configuration/variantcode string {{ preseed_keyboard_variant }} d-i hw-detect/load_firmware boolean false @@ -50,7 +52,7 @@ 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 Europe/Vienna +d-i time/zone string {{ preseed_timezone }} d-i clock-setup/ntp boolean false -- cgit v1.2.3