From 04ce0a9d7fb9cf7ec45e64f1be25b27f1cc2f2c4 Mon Sep 17 00:00:00 2001
From: Jerry Vonau <jvonau3@gmail.com>
Date: Mon, 24 Apr 2023 09:17:07 -0500
Subject: [PATCH] netplan2

---
 .../templates/hostapd/iiab-test-wifi.j2       | 29 ++++++++++++++-----
 1 file changed, 21 insertions(+), 8 deletions(-)

diff --git a/roles/network/templates/hostapd/iiab-test-wifi.j2 b/roles/network/templates/hostapd/iiab-test-wifi.j2
index 948c8bd2a..2df652560 100755
--- a/roles/network/templates/hostapd/iiab-test-wifi.j2
+++ b/roles/network/templates/hostapd/iiab-test-wifi.j2
@@ -5,6 +5,7 @@ SSID=""
 # when we get here br0 should be available and dbus wpa_supplicant was started if enabled. Some
 # of the backends that use wpa_supplicant should be active based on the Before= After= lines in
 # the iiab-wifi-test.service unit file.
+# https://github.com/iiab/iiab/pull/3542#issuecomment-1519647266
 
 echo "iiab-test-wifi called"
 echo "running pid $$"
@@ -31,6 +32,7 @@ if [ -f /run/netplan/wpa-$IFACE.conf ]; then
     SSID=$(grep ssid /run/netplan/wpa-$IFACE.conf | awk -F = '{print $2}' | sed -r s/\"// | sed -r s/\"//)
     REG_DOM=$(grep country /run/netplan/wpa-$IFACE.conf | awk -F = '{ print $2 }')
     if [ -z "$REG_DOM" ]; then
+        NETPLAN=2
         echo "cover netplan wifi client lack of country= setting to {{ host_country_code }}"
         sed -i "s|ctrl_interface=/run/wpa_supplicant|&\ncountry={{ host_country_code }}|" /run/netplan/wpa-$IFACE.conf
     else
@@ -52,11 +54,28 @@ echo "ssid is $SSID"
 
 if [ -z "$SSID" ]; then
     echo "Couldn't find ssid $SSID to use exiting"
-    if [ $NETPLAN -eq 1 ]; then
+    if [ $NETPLAN -gt 0 ]; then
        echo "Netplan1"
     fi
     exit 0
 fi
+
+if [ $NETPLAN -gt 0 ]; then
+    echo "Netplan2"
+    wpa_processes=$(ps -A | grep wpa_supplicant | wc -l)
+    if [ $wpa_processes -eq 1 ]; then
+        # This is more of a netplan workaround should go away.
+        echo "Starting netplan wifi"
+        NETPLAN=2
+    else
+        echo "Restarting netplan wifi"
+    fi
+    # This one handles the changing of the country code from above
+    if [ $NETPLAN -eq 2 ]; then
+        /bin/systemctl restart netplan-wpa-$IFACE.service
+        sleep 2
+    fi
+fi
 wpa_cli -i $IFACE scan > /dev/null
 sleep 2
 FREQ=$(wpa_cli -i $IFACE scan_results | grep "$SSID" | awk '{print $2}')
@@ -72,15 +91,9 @@ done
 
 echo "Using $FREQ2 for $SSID"
 
-if [ $NETPLAN -eq 1 ]; then
-    echo "Netplan2"
-    # This is more of a netplan workaround should go away.
-    /bin/systemctl restart netplan-wpa-$IFACE.service
-fi
-
 if [ -z "$FREQ2" ]; then
     echo "Couldn't find frequency to use exiting"
-    if [ $NETPLAN -eq 1 ]; then
+    if [ $NETPLAN -gt 0 ]; then
         echo "Netplan3"
     fi
     exit 0