From fa8ac3606d74bd05eab06c50b698307cf2a09beb Mon Sep 17 00:00:00 2001 From: A Holt Date: Mon, 25 Feb 2019 11:56:57 -0500 Subject: [PATCH 1/3] @jvonau: suppress restarting of dnsmasq if initial install is using WiFi --- 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 ddcf111a4..72339b680 100644 --- a/roles/network/tasks/restart.yml +++ b/roles/network/tasks/restart.yml @@ -74,4 +74,4 @@ systemd: name: "{{ dhcp_service2 }}" state: restarted - when: iiab_network_mode != "Appliance" and iiab_wan_iface != discovered_wireless_iface + when: (iiab_network_mode != "Appliance") and (iiab_wan_iface != discovered_wireless_iface) and (not no_net_restart) From 3ec408fbd1626cd9147e39e3e37c6cf028d2f248 Mon Sep 17 00:00:00 2001 From: A Holt Date: Mon, 25 Feb 2019 12:00:46 -0500 Subject: [PATCH 2/3] cleaner, on @jvonau's recommendation --- roles/network/tasks/restart.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/roles/network/tasks/restart.yml b/roles/network/tasks/restart.yml index 72339b680..64dc0ba24 100644 --- a/roles/network/tasks/restart.yml +++ b/roles/network/tasks/restart.yml @@ -74,4 +74,5 @@ systemd: name: "{{ dhcp_service2 }}" state: restarted - when: (iiab_network_mode != "Appliance") and (iiab_wan_iface != discovered_wireless_iface) and (not no_net_restart) + when: (iiab_network_mode != "Appliance") and (not no_net_restart) + #when: iiab_network_mode != "Appliance" and iiab_wan_iface != discovered_wireless_iface From 4f98967a2d84c465911ba83667708de457ac7cc0 Mon Sep 17 00:00:00 2001 From: A Holt Date: Mon, 25 Feb 2019 12:34:22 -0500 Subject: [PATCH 3/3] iiab_base_ver: 6.7 -> 7.0 --- roles/0-init/defaults/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/0-init/defaults/main.yml b/roles/0-init/defaults/main.yml index ccdfd58e0..1c5ec2081 100644 --- a/roles/0-init/defaults/main.yml +++ b/roles/0-init/defaults/main.yml @@ -1,5 +1,5 @@ # Use these to tag a release at a point in time, for {{ iiab_env_file }} -iiab_base_ver: 6.7 +iiab_base_ver: 7.0 iiab_revision: 0 # These entries should never be changed in this file.