1 files changed, 10 insertions, 11 deletions
diff --git a/roles/installer/debian/preseed/templates/preseed_xubuntu-focal-desktop.cfg.j2 b/roles/installer/debian/preseed/templates/preseed_xubuntu-focal-desktop.cfg.j2
index ee4eb717..7a424673 100644
--- a/roles/installer/debian/preseed/templates/preseed_xubuntu-focal-desktop.cfg.j2
+++ b/roles/installer/debian/preseed/templates/preseed_xubuntu-focal-desktop.cfg.j2
@@ -2,17 +2,16 @@
 #  spreadspace preseed file for Ubuntu focal based workstations
 #########################################################################
 
-d-i debian-installer/language string en
-d-i debian-installer/country string AT
-d-i debian-installer/locale string de_AT.UTF-8
-d-i localechooser/preferred-locale string de_AT.UTF-8
-d-i localechooser/supported-locales multiselect de_DE.UTF-8, en_US.UTF-8
-d-i keyboard-configuration/xkb-keymap select de
-## TODO: this still doesn't work properly...
-d-i keyboard-configuration/layout select German (Austria)
-d-i keyboard-configuration/layoutcode string at
-d-i keyboard-configuration/layoutcode string nodeadkeys
+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/layoutcode string {{ preseed_keyboard_layout }}
+d-i keyboard-configuration/variantcode string {{ preseed_keyboard_variant }}
 
 d-i hw-detect/load_firmware boolean false
 
@@ -53,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