From a5128f839bc5b05e14dbbcb903367f6e66e5c450 Mon Sep 17 00:00:00 2001 From: George Hunt Date: Fri, 2 Jun 2017 23:50:24 +0000 Subject: [PATCH] remove anything that breaks if resolvconf service is referenced --- roles/network/tasks/restart.yml | 6 ------ roles/network/tasks/rpi_debian.yml | 7 +------ 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/roles/network/tasks/restart.yml b/roles/network/tasks/restart.yml index 36b2456b3..0d7068150 100644 --- a/roles/network/tasks/restart.yml +++ b/roles/network/tasks/restart.yml @@ -16,12 +16,6 @@ when: named_enabled register: dns_started -# decide if resolvconf will ever be used FIXME -- name: Configure resolvconf -- put localhost in resolv.conf - lineinfile: line="nameserver 127.0.0.1" - dest=/etc/resolvconf/resolv.conf.d/head - when: named_enabled and is_debuntu and dns_started.changed - - name: Stop dansguardian service: name=dansguardian state=stopped diff --git a/roles/network/tasks/rpi_debian.yml b/roles/network/tasks/rpi_debian.yml index 7ad208d58..9af388d5c 100644 --- a/roles/network/tasks/rpi_debian.yml +++ b/roles/network/tasks/rpi_debian.yml @@ -16,12 +16,7 @@ - name: Get the stock resolv.conf manager package: name=resolvconf - state=present - -- name: recent raspbian uses dhcpcd rather than resolvconf - service: name=resolvconf - enabled=False - state=stopped + state=absent - name: on upgrade from earlier xsce versions, remove /etc/network/interfaces.d/br0 file: path=/etc/network/interfaces.d/br0