From f30479cfc97d4d552d6a13e7a60dda44eca1b2fe Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Sat, 5 Oct 2019 22:51:38 +0200 Subject: keep using systemd-resolved for now --- roles/preseed/templates/preseed_debian-buster.cfg.j2 | 1 - roles/preseed/templates/preseed_debian-stretch.cfg.j2 | 1 - roles/preseed/templates/preseed_ubuntu-bionic.cfg.j2 | 1 - roles/preseed/templates/preseed_ubuntu-xenial.cfg.j2 | 1 - roles/preseed/templates/preseed_xubuntu-cosmic-desktop-with-raid.cfg.j2 | 1 - 5 files changed, 5 deletions(-) (limited to 'roles') diff --git a/roles/preseed/templates/preseed_debian-buster.cfg.j2 b/roles/preseed/templates/preseed_debian-buster.cfg.j2 index 88cd4138..9952fa0a 100644 --- a/roles/preseed/templates/preseed_debian-buster.cfg.j2 +++ b/roles/preseed/templates/preseed_debian-buster.cfg.j2 @@ -132,7 +132,6 @@ d-i finish-install/reboot_in_progress note d-i preseed/late_command string \ lvremove -f {{ hostvars[hostname].host_name }}/dummy; \ in-target bash -c "apt-get update -q && apt-get full-upgrade -y -q"; \ - in-target bash -c "systemctl mask systemd-resolved.service"; \ 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/preseed/templates/preseed_debian-stretch.cfg.j2 b/roles/preseed/templates/preseed_debian-stretch.cfg.j2 index 4a99f766..8969fa7c 100644 --- a/roles/preseed/templates/preseed_debian-stretch.cfg.j2 +++ b/roles/preseed/templates/preseed_debian-stretch.cfg.j2 @@ -132,7 +132,6 @@ d-i finish-install/reboot_in_progress note d-i preseed/late_command string \ lvremove -f {{ hostvars[hostname].host_name }}/dummy; \ in-target bash -c "apt-get update -q && apt-get full-upgrade -y -q"; \ - in-target bash -c "systemctl mask systemd-resolved.service"; \ 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/preseed/templates/preseed_ubuntu-bionic.cfg.j2 b/roles/preseed/templates/preseed_ubuntu-bionic.cfg.j2 index 5b6ea505..92bb00af 100644 --- a/roles/preseed/templates/preseed_ubuntu-bionic.cfg.j2 +++ b/roles/preseed/templates/preseed_ubuntu-bionic.cfg.j2 @@ -140,7 +140,6 @@ d-i preseed/late_command string \ lvremove -f {{ hostvars[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 "systemctl mask systemd-resolved.service"; \ in-target bash -c "apt-get purge -y -q netplan.io && apt-get autoremove -y -q && rm -rf /etc/netplan"; \ in-target bash -c "sed -e 's/^allow-hotplug/auto/' -i /etc/network/interfaces"; \ {% if preseed_force_net_ifnames_policy is defined %} diff --git a/roles/preseed/templates/preseed_ubuntu-xenial.cfg.j2 b/roles/preseed/templates/preseed_ubuntu-xenial.cfg.j2 index 7c78b746..0b3d3698 100644 --- a/roles/preseed/templates/preseed_ubuntu-xenial.cfg.j2 +++ b/roles/preseed/templates/preseed_ubuntu-xenial.cfg.j2 @@ -138,7 +138,6 @@ d-i finish-install/reboot_in_progress note d-i preseed/late_command string \ lvremove -f {{ hostvars[hostname].host_name }}/dummy; \ in-target bash -c "apt-get update -q && apt-get full-upgrade -y -q"; \ - in-target bash -c "systemctl mask systemd-resolved.service"; \ 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/preseed/templates/preseed_xubuntu-cosmic-desktop-with-raid.cfg.j2 b/roles/preseed/templates/preseed_xubuntu-cosmic-desktop-with-raid.cfg.j2 index b687b230..50dcfc7c 100644 --- a/roles/preseed/templates/preseed_xubuntu-cosmic-desktop-with-raid.cfg.j2 +++ b/roles/preseed/templates/preseed_xubuntu-cosmic-desktop-with-raid.cfg.j2 @@ -146,7 +146,6 @@ d-i preseed/late_command string \ lvremove -f {{ hostvars[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 "systemctl mask systemd-resolved.service"; \ in-target bash -c "apt-get purge -y -q netplan.io && apt-get autoremove -y -q && rm -rf /etc/netplan"; \ in-target bash -c "sed -e 's/^allow-hotplug/auto/' -i /etc/network/interfaces"; \ {% if preseed_force_net_ifnames_policy is defined %} -- cgit v1.2.3