diff options
author | Christian Pointner <equinox@spreadspace.org> | 2020-11-04 22:20:24 +0100 |
---|---|---|
committer | Christian Pointner <equinox@spreadspace.org> | 2020-11-04 22:22:11 +0100 |
commit | 7c3376d3a527a308e3ca4a641afd3fe043194096 (patch) | |
tree | 0700fff7253809383ca1c345892bffdf3bf674dd /roles/installer/debian/preseed/templates/preseed_ubuntu-xenial.cfg.j2 | |
parent | upgrade collabora code to 6.4 (diff) |
harmonize preseed files for server and workstations
Diffstat (limited to 'roles/installer/debian/preseed/templates/preseed_ubuntu-xenial.cfg.j2')
-rw-r--r-- | roles/installer/debian/preseed/templates/preseed_ubuntu-xenial.cfg.j2 | 10 |
1 files changed, 8 insertions, 2 deletions
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 a62956af..28d68250 100644 --- a/roles/installer/debian/preseed/templates/preseed_ubuntu-xenial.cfg.j2 +++ b/roles/installer/debian/preseed/templates/preseed_ubuntu-xenial.cfg.j2 @@ -54,10 +54,15 @@ d-i clock-setup/ntp boolean false {% include 'partman_config.j2' %} -{% if preseed_virtual_machine %} +{% if preseed_kernel_image is defined %} +d-i base-installer/kernel/image string {{ preseed_kernel_image }} +{% elif preseed_virtual_machine %} d-i base-installer/kernel/image string linux-virtual {% endif %} +{% if preseed_no_splash %} d-i debian-installer/splash boolean false +d-i debian-installer/add-kernel-opts string nosplash +{% endif %} 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.host }} @@ -66,7 +71,7 @@ d-i apt-setup/security_path string {{ apt_repo_providers[hostvars[install_hostna d-i apt-setup/multiarch string amd64 {% endif %} -tasksel tasksel/first multiselect +tasksel tasksel/first multiselect {{ preseed_install_tasks | join(', ') }} d-i pkgsel/include string openssh-server {{ hostvars[install_hostname].python_basename }} {{ hostvars[install_hostname].python_basename }}-apt d-i pkgsel/upgrade select safe-upgrade popularity-contest popularity-contest/participate boolean false @@ -78,6 +83,7 @@ d-i finish-install/reboot_in_progress note d-i preseed/late_command string \ lvremove -f {{ hostvars[install_hostname].host_name }}/dummy; \ in-target bash -c "apt-get update -q && apt-get full-upgrade -y -q"; \ + in-target bash -c "env SUDO_FORCE_REMOVE=yes apt-get purge -y -q ubuntu-minimal sudo ubuntu-advantage-tools"; \ in-target bash -c "sed -e 's/^allow-hotplug/auto/' -i /etc/network/interfaces"; \ {% if preseed_force_net_ifnames_policy is defined %} mkdir -p /target/etc/systemd/network; \ |