From ee4ed1b94db4d0eea5cae9db24832bd9cf842314 Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 27 Jun 2019 19:58:10 -0400 Subject: [PATCH] towards fixing #1778 --- roles/network/tasks/enable_services.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/roles/network/tasks/enable_services.yml b/roles/network/tasks/enable_services.yml index 0122143ec..826eb00b3 100644 --- a/roles/network/tasks/enable_services.yml +++ b/roles/network/tasks/enable_services.yml @@ -54,14 +54,14 @@ dest: /etc/dnsmasq.d/iiab.conf when: dnsmasq_enabled and dnsmasq_install and (iiab_network_mode != "Appliance") -- name: Copy script to restart dnsmasq whenever br0 comes up +- name: Copy script to restart dnsmasq whenever br0 comes up, if isn't Appliance (but don't do this on RPi or Ubuntu 16) template: - src: "roles/network/templates/network/dnsmasq.sh.j2" - dest: "/etc/networkd-dispatcher/routable.d/dnsmasq.sh" - mode: "0755" + src: roles/network/templates/network/dnsmasq.sh.j2 + dest: /etc/networkd-dispatcher/routable.d/dnsmasq.sh + mode: 0755 owner: root group: root - when: dnsmasq_enabled and dnsmasq_install and (iiab_network_mode != "Appliance") and (not is_rpi) + when: dnsmasq_enabled and dnsmasq_install and (iiab_network_mode != "Appliance") and (not is_rpi) and (not is_ubuntu_16) - name: Remove /etc/dnsmasq.d/iiab.conf, when not dnsmasq_enabled or is Appliance file: