Merge branch 'reg_dom2+iiab-hotspot-off_etc' into reg_dom3

adm-run-roles-tmp.yml

@@ -1,15 +0,0 @@
----
-- hosts: all
-  become: yes
-
-  vars_files:
-  - vars/default_vars.yml
-  - vars/{{ ansible_local.local_facts.os_ver }}.yml
-  - /etc/iiab/local_vars.yml
-  - /etc/iiab/iiab_state.yml
-
-  roles:
-    - { role: 0-init }
-    - { role: captiveportal }
-    - { role: lokole }
-    - { role: network }

roles/network/templates/hostapd/iiab-wifi-test.service.j2

@@ -3,10 +3,22 @@ Description=IIAB find channel freq for ssid
 Requisite=sys-subsystem-net-devices-wlan0.device
 Requisite=iiab-clone-wifi.service
 Requisite=wpa_supplicant.service
+
+# 2023-04-24 PR #3549: c49adcf went too far and broke netplan-systemd
+#Requires=network-pre.target
+#BindsTo=sys-subsystem-net-devices-{{ discovered_wireless_iface }}.device
+#After=sys-subsystem-net-devices-{{ discovered_wireless_iface }}.device
+#After=iiab-clone-wifi.service
+
+#After=network-pre.target
+#After=wpa_supplicant.service
+#Wants=wpa_supplicant.service
+
 After=NetworkManager.service
 After=netplan-wpa-{{ discovered_wireless_iface }}.service
 Before=dhcpcd.service
 Before=wpa_supplicant@{{ discovered_wireless_iface }}.service
+#Before=network.target
 
 [Service]
 TimeoutStartSec=120