From e64f204248aefd6ccd394a37879586fc9611e500 Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Sat, 31 Oct 2020 19:13:38 +0100 Subject: ubuntu preseed files clean handling of splash screen --- .../debian/preseed/templates/preseed_ubuntu-bionic.cfg.j2 | 4 ++-- .../debian/preseed/templates/preseed_ubuntu-focal.cfg.j2 | 4 ++-- .../debian/preseed/templates/preseed_ubuntu-xenial.cfg.j2 | 4 ++-- .../debian/preseed/templates/preseed_xubuntu-focal-desktop.cfg.j2 | 8 ++++---- 4 files changed, 10 insertions(+), 10 deletions(-) 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 13b92a2b..a08fd2ab 100644 --- a/roles/installer/debian/preseed/templates/preseed_ubuntu-bionic.cfg.j2 +++ b/roles/installer/debian/preseed/templates/preseed_ubuntu-bionic.cfg.j2 @@ -60,6 +60,8 @@ d-i clock-setup/ntp boolean false {% if preseed_virtual_machine %} d-i base-installer/kernel/image string linux-virtual {% endif %} +d-i debian-installer/splash 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.host }} d-i apt-setup/security_path string {{ apt_repo_providers[hostvars[install_hostname].apt_repo_provider].ubuntu.path }} @@ -80,8 +82,6 @@ d-i preseed/late_command string \ lvremove -f {{ hostvars[install_hostname].host_name }}/dummy; \ in-target bash -c "swapoff -a; sed -e '/^\/swapfile/d' -i /etc/fstab; rm -f /swapfile"; \ in-target bash -c "apt-get update -q && apt-get full-upgrade -y -q"; \ - in-target bash -c "sed -e 's/^\(GRUB_CMDLINE_LINUX_DEFAULT=.*\)splash/\1/' -i /etc/default/grub"; \ - in-target bash -c "update-grub"; \ {% if preseed_no_netplan %} in-target bash -c "apt-get purge -y -q netplan.io && apt-get autoremove -y -q && rm -rf /etc/netplan"; \ {% endif %} 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 3b8de771..81aaa9cc 100644 --- a/roles/installer/debian/preseed/templates/preseed_ubuntu-focal.cfg.j2 +++ b/roles/installer/debian/preseed/templates/preseed_ubuntu-focal.cfg.j2 @@ -60,6 +60,8 @@ d-i clock-setup/ntp boolean false {% if preseed_virtual_machine %} d-i base-installer/kernel/image string linux-virtual {% endif %} +d-i debian-installer/splash 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.host }} d-i apt-setup/security_path string {{ apt_repo_providers[hostvars[install_hostname].apt_repo_provider].ubuntu.path }} @@ -80,8 +82,6 @@ d-i preseed/late_command string \ lvremove -f {{ hostvars[install_hostname].host_name }}/dummy; \ in-target bash -c "swapoff -a; sed -e '/^\/swapfile/d' -i /etc/fstab; rm -f /swapfile"; \ in-target bash -c "apt-get update -q && apt-get full-upgrade -y -q"; \ - in-target bash -c "sed -e 's/^\(GRUB_CMDLINE_LINUX_DEFAULT=.*\)splash/\1/' -i /etc/default/grub"; \ - in-target bash -c "update-grub"; \ {% if preseed_no_netplan %} in-target bash -c "apt-get purge -y -q netplan.io && apt-get autoremove -y -q && rm -rf /etc/netplan"; \ {% endif %} 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 5ea76342..a62956af 100644 --- a/roles/installer/debian/preseed/templates/preseed_ubuntu-xenial.cfg.j2 +++ b/roles/installer/debian/preseed/templates/preseed_ubuntu-xenial.cfg.j2 @@ -57,6 +57,8 @@ d-i clock-setup/ntp boolean false {% if preseed_virtual_machine %} d-i base-installer/kernel/image string linux-virtual {% endif %} +d-i debian-installer/splash 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.host }} d-i apt-setup/security_path string {{ apt_repo_providers[hostvars[install_hostname].apt_repo_provider].ubuntu.path }} @@ -76,8 +78,6 @@ 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 "sed -e 's/^\(GRUB_CMDLINE_LINUX_DEFAULT=.*\)splash/\1/' -i /etc/default/grub"; \ - in-target bash -c "update-grub"; \ 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; \ 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 ab20ed78..c89d0df3 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 @@ -60,6 +60,10 @@ d-i clock-setup/ntp boolean false {% include 'partman_config.j2' %} +{% if preseed_virtual_machine %} +d-i base-installer/kernel/image string linux-virtual +{% 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 }} d-i apt-setup/security_path string {{ apt_repo_providers[hostvars[install_hostname].apt_repo_provider].ubuntu.path }} @@ -80,10 +84,6 @@ d-i preseed/late_command string \ lvremove -f {{ hostvars[install_hostname].host_name }}/dummy; \ in-target bash -c "swapoff -a; sed -e '/^\/swapfile/d' -i /etc/fstab; rm -f /swapfile"; \ in-target bash -c "apt-get update -q && apt-get full-upgrade -y -q"; \ -{% if preseed_virtual_machine %} - in-target bash -c "apt-get install -y -q --no-install-recommends linux-image-virtual"; \ - in-target bash -c "apt-get purge -y -q linux-image-generic intel-microcode amd64-microcode iucode-tool linux-firmware"; \ -{% endif %} {% if preseed_no_netplan %} in-target bash -c "apt-get purge -y -q netplan.io && apt-get autoremove -y -q && rm -rf /etc/netplan"; \ {% endif %} -- cgit v1.2.3