From 23cde6ba14f19009b933baec7a95d8bb1eda9e9f Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Wed, 5 Aug 2020 21:12:37 +0200 Subject: fix debian buster keyring, disable multi-arch on ubuntu --- .../debian/preseed/templates/preseed_xubuntu-focal-desktop.cfg.j2 | 3 +++ 1 file changed, 3 insertions(+) (limited to 'roles/installer/debian/preseed/templates/preseed_xubuntu-focal-desktop.cfg.j2') 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 46403443..5eafb358 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 @@ -62,6 +62,9 @@ d-i clock-setup/ntp boolean false d-i base-installer/install-recommends boolean false d-i apt-setup/security_host string {{ apt_repo_providers[hostvars[install_hostname].apt_repo_provider].ubuntu }} +{% if hostvars[install_hostname].install_cooked.arch | default('amd64') == 'amd64' %} +d-i apt-setup/multiarch string amd64 +{% endif %} tasksel tasksel/first multiselect xubuntu-desktop d-i pkgsel/include string openssh-server {{ hostvars[install_hostname].python_basename }} {{ hostvars[install_hostname].python_basename }}-apt ifupdown -- cgit v1.2.3