From 94d80f7ac44a4ddbd24e6dbec25787a27f15a400 Mon Sep 17 00:00:00 2001
From: Jerry Vonau <jvonau3@gmail.com>
Date: Fri, 20 May 2022 11:25:01 -0500
Subject: [PATCH] always detect and report - record enabled

---
 roles/network/tasks/computed_network.yml |  2 ++
 roles/network/tasks/main.yml             | 36 ++++++++++++------------
 2 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/roles/network/tasks/computed_network.yml b/roles/network/tasks/computed_network.yml
index efe764642..8c7ac5515 100644
--- a/roles/network/tasks/computed_network.yml
+++ b/roles/network/tasks/computed_network.yml
@@ -172,3 +172,5 @@
       value: "{{ iiab_lan_iface }}"
     - option: iiab_network_mode
       value: "{{ iiab_network_mode }}"
+    - option: network_enabled
+      value: "{{ network_enabled }}"
diff --git a/roles/network/tasks/main.yml b/roles/network/tasks/main.yml
index a1d34eac7..a4808b47e 100644
--- a/roles/network/tasks/main.yml
+++ b/roles/network/tasks/main.yml
@@ -7,26 +7,26 @@
     name: firmware
   when: rpi_model != "none"
 
+- name: detected_network
+  include_tasks: detected_network.yml
+
+#- name: "Set 'no_net_restart: True' if discovered_wireless_iface == iiab_wan_iface"
+- name: "Set 'no_net_restart: True' if has_wifi_gateway is defined"
+  set_fact:
+    no_net_restart: True    # 2020-09-12:
+    # 0-init/defaults/main.yml - default boolean value of False
+    # network/tasks/main.yml - changes flag based on conditional present
+    # Var is currently used in 9 subsequent files, to suppress restarting of
+    # hostapd, dnsmasq and/or other networking service in computed_services.yml,
+    # debian.yml, detected_network.yml, down-debian.yml, netplan.yml,
+    # NM-debian.yml, restart.yml, rpi_debian.yml, sysd-netd-debian.yml
+  when: has_wifi_gateway is defined
+
+- name: computed_network
+  include_tasks: computed_network.yml
+
 - name: Configuring Network if enabled
   block:
-  - name: detected_network
-    include_tasks: detected_network.yml
-
-  #- name: "Set 'no_net_restart: True' if discovered_wireless_iface == iiab_wan_iface"
-  - name: "Set 'no_net_restart: True' if has_wifi_gateway is defined"
-    set_fact:
-      no_net_restart: True    # 2020-09-12:
-      # 0-init/defaults/main.yml - default boolean value of False
-      # network/tasks/main.yml - changes flag based on conditional present
-      # Var is currently used in 9 subsequent files, to suppress restarting of
-      # hostapd, dnsmasq and/or other networking service in computed_services.yml,
-      # debian.yml, detected_network.yml, down-debian.yml, netplan.yml,
-      # NM-debian.yml, restart.yml, rpi_debian.yml, sysd-netd-debian.yml
-    when: has_wifi_gateway is defined
-
-  - name: computed_network
-    include_tasks: computed_network.yml
-
   # - name: Configure wondershaper
   #   include_tasks: wondershaper.yml
   #   when: wondershaper_install or wondershaper_installed is defined