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 --- roles/installer/debian/preseed/defaults/main.yml | 10 ++++++++++ .../templates/preseed_debian-bullseye.cfg.j2 | 15 ++++++++++----- .../preseed/templates/preseed_debian-buster.cfg.j2 | 15 ++++++++++----- .../preseed/templates/preseed_debian-jessie.cfg.j2 | 15 ++++++++++----- .../preseed/templates/preseed_debian-stretch.cfg.j2 | 15 ++++++++++----- .../preseed/templates/preseed_ubuntu-bionic.cfg.j2 | 18 ++++++++++-------- .../preseed/templates/preseed_ubuntu-focal.cfg.j2 | 18 ++++++++++-------- .../preseed/templates/preseed_ubuntu-xenial.cfg.j2 | 18 ++++++++++-------- .../templates/preseed_xubuntu-focal-desktop.cfg.j2 | 21 ++++++++++----------- 9 files changed, 90 insertions(+), 55 deletions(-) (limited to 'roles/installer/debian/preseed') diff --git a/roles/installer/debian/preseed/defaults/main.yml b/roles/installer/debian/preseed/defaults/main.yml index 2ad4e32a..5b7bea07 100644 --- a/roles/installer/debian/preseed/defaults/main.yml +++ b/roles/installer/debian/preseed/defaults/main.yml @@ -2,6 +2,16 @@ # preseed_initrd # preseed_tmpdir: +preseed_language: en +preseed_country: US +preseed_locales: + - en_US.UTF-8 + +preseed_keyboard_layout: de +preseed_keyboard_variant: nodeadkeys + +preseed_timezone: Europe/Vienna + # preseed_force_net_ifnames_policy: path preseed_no_netplan: no diff --git a/roles/installer/debian/preseed/templates/preseed_debian-bullseye.cfg.j2 b/roles/installer/debian/preseed/templates/preseed_debian-bullseye.cfg.j2 index d02ab496..04ccfcb4 100644 --- a/roles/installer/debian/preseed/templates/preseed_debian-bullseye.cfg.j2 +++ b/roles/installer/debian/preseed/templates/preseed_debian-bullseye.cfg.j2 @@ -2,10 +2,15 @@ # spreadspace preseed file for Debian bullseye 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 keyboard-configuration/xkb-keymap select us +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 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 hw-detect/load_firmware boolean false @@ -42,7 +47,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 diff --git a/roles/installer/debian/preseed/templates/preseed_debian-buster.cfg.j2 b/roles/installer/debian/preseed/templates/preseed_debian-buster.cfg.j2 index fa70d2b9..77671947 100644 --- a/roles/installer/debian/preseed/templates/preseed_debian-buster.cfg.j2 +++ b/roles/installer/debian/preseed/templates/preseed_debian-buster.cfg.j2 @@ -2,10 +2,15 @@ # spreadspace preseed file for Debian buster 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 keyboard-configuration/xkb-keymap select us +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 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 hw-detect/load_firmware boolean false @@ -42,7 +47,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 diff --git a/roles/installer/debian/preseed/templates/preseed_debian-jessie.cfg.j2 b/roles/installer/debian/preseed/templates/preseed_debian-jessie.cfg.j2 index d033b3b0..02379c16 100644 --- a/roles/installer/debian/preseed/templates/preseed_debian-jessie.cfg.j2 +++ b/roles/installer/debian/preseed/templates/preseed_debian-jessie.cfg.j2 @@ -2,10 +2,15 @@ # spreadspace preseed file for Debian jessie 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 keyboard-configuration/xkb-keymap select us +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 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 hw-detect/load_firmware boolean false @@ -42,7 +47,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 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 0528f33c..01108f09 100644 --- a/roles/installer/debian/preseed/templates/preseed_debian-stretch.cfg.j2 +++ b/roles/installer/debian/preseed/templates/preseed_debian-stretch.cfg.j2 @@ -2,10 +2,15 @@ # spreadspace preseed file for Debian stretch 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 keyboard-configuration/xkb-keymap select us +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 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 hw-detect/load_firmware boolean false @@ -42,7 +47,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 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 61f08552..503d09c4 100644 --- a/roles/installer/debian/preseed/templates/preseed_ubuntu-bionic.cfg.j2 +++ b/roles/installer/debian/preseed/templates/preseed_ubuntu-bionic.cfg.j2 @@ -2,14 +2,16 @@ # spreadspace preseed file for Ubuntu bionic 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 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 diff --git a/roles/installer/debian/preseed/templates/preseed_ubuntu-xenial.cfg.j2 b/roles/installer/debian/preseed/templates/preseed_ubuntu-xenial.cfg.j2 index 28d68250..fbebcddf 100644 --- a/roles/installer/debian/preseed/templates/preseed_ubuntu-xenial.cfg.j2 +++ b/roles/installer/debian/preseed/templates/preseed_ubuntu-xenial.cfg.j2 @@ -2,14 +2,16 @@ # spreadspace preseed file for Ubuntu xenial 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 @@ -47,7 +49,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 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 -- cgit v1.2.3