From 3bb839294de5c1ff79a28e44070392ae670141f3 Mon Sep 17 00:00:00 2001 From: Jerry Vonau Date: Sun, 2 Feb 2020 00:21:45 -0600 Subject: [PATCH 1/5] install time fix for #2220 --- roles/network/tasks/restart.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/network/tasks/restart.yml b/roles/network/tasks/restart.yml index 9618a9960..6c6720d3c 100644 --- a/roles/network/tasks/restart.yml +++ b/roles/network/tasks/restart.yml @@ -74,6 +74,6 @@ systemd: name: "{{ dhcp_service2 }}" state: restarted + when: not no_net_restart #when: (iiab_network_mode != "Appliance") # Sufficient b/c br0 exists thanks to /etc/network/interfaces.d/iiab - #when: (iiab_network_mode != "Appliance") and (not no_net_restart) #when: iiab_network_mode != "Appliance" and iiab_wan_iface != discovered_wireless_iface From e0fd77836bb9a8b5e9bd418f1cea54bbc9252aeb Mon Sep 17 00:00:00 2001 From: Jerry Vonau Date: Sun, 2 Feb 2020 00:23:51 -0600 Subject: [PATCH 2/5] restore iiab_lan_enabled iiab_user_lan gui_desired_network_role is intended to be optional. iiab_lan_enabled: False intended to be big hammer to ignore all other interfaces iiab_user_lan: user override to define the LAN interface when iiab provided bridging is not wanted Could be rename user_desired_network_role.... --- roles/network/defaults/main.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/roles/network/defaults/main.yml b/roles/network/defaults/main.yml index cf450bb59..7cdf5b37c 100644 --- a/roles/network/defaults/main.yml +++ b/roles/network/defaults/main.yml @@ -91,7 +91,6 @@ systemd_networkd_active: False # The values here are default local variables gui_wan_iface: "unset" gui_static_wan_ip: "unset" -gui_desired_network_role: Gateway wondershaper_dspeed: "4096" wondershaper_upspeed: "1024" From 22e5159597457634087d1742d79e833232f488cd Mon Sep 17 00:00:00 2001 From: Jerry Vonau Date: Sun, 16 Feb 2020 07:10:01 -0600 Subject: [PATCH 3/5] gui_desired_network_role is defined --- roles/network/templates/network/rpi.j2 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/roles/network/templates/network/rpi.j2 b/roles/network/templates/network/rpi.j2 index e0f21745a..9e3c1b69b 100644 --- a/roles/network/templates/network/rpi.j2 +++ b/roles/network/templates/network/rpi.j2 @@ -1,6 +1,7 @@ # iiab_network_mode is {{ iiab_network_mode }} +{% if gui_desired_network_role is defined %} # gui_desired_network_role is {{ gui_desired_network_role }} - +{% endif %} {% if iiab_network_mode != "Appliance" %} ################# LANCONTROLLER ################### auto br0 From 8946ed1f039607ef877361a3911084f9cb2c177e Mon Sep 17 00:00:00 2001 From: Jerry Vonau Date: Mon, 17 Feb 2020 03:02:40 -0600 Subject: [PATCH 4/5] CP started dnsmasq can't shut it down now, resolvconf set /etc/resolv.conf to 127.0.0.1 --- roles/network/tasks/down-debian.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/network/tasks/down-debian.yml b/roles/network/tasks/down-debian.yml index fb5589d0f..68fdd5c8e 100644 --- a/roles/network/tasks/down-debian.yml +++ b/roles/network/tasks/down-debian.yml @@ -22,4 +22,4 @@ service: name: dnsmasq state: stopped - when: dnsmasq_install | bool + when: dnsmasq_install | bool and not no_net_restart From e5f2a251e27c77288ee95006aaeae47f1fc55b04 Mon Sep 17 00:00:00 2001 From: A Holt Date: Mon, 17 Feb 2020 13:08:41 -0500 Subject: [PATCH 5/5] Update network/tasks/down-debian.yml --- roles/network/tasks/down-debian.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/roles/network/tasks/down-debian.yml b/roles/network/tasks/down-debian.yml index 68fdd5c8e..a0e9008e0 100644 --- a/roles/network/tasks/down-debian.yml +++ b/roles/network/tasks/down-debian.yml @@ -6,20 +6,20 @@ # src: network/resolvconf.j2 - name: BIND may be affected - service: + systemd: name: "{{ dns_service }}" state: stopped when: named_install and dnsmasq_enabled # dhcpd_server release the interface - name: dhcpd_server may be affected - stopping dhcpd - service: + systemd: name: dhcpd state: stopped when: dhcpd_install | bool - name: dhcpd_server may be affected - stopping dnsmasq - service: + systemd: name: dnsmasq state: stopped - when: dnsmasq_install | bool and not no_net_restart + when: dnsmasq_install and not no_net_restart