Default to interface value in /etc/raspap/hostapd.ini

installers/raspapd.service

@@ -16,7 +16,7 @@ After=multi-user.target
 
 [Service]
 Type=oneshot
-ExecStart=/bin/bash /etc/raspap/hostapd/servicestart.sh --interface uap0 --seconds 3
+ExecStart=/bin/bash /etc/raspap/hostapd/servicestart.sh --seconds 1
 RemainAfterExit=no
 
 [Install]

installers/servicestart.sh

@@ -34,6 +34,20 @@ esac
 done
 set -- "${positional[@]}"
 
+# Load config file into associative array
+declare -A config
+if [ -r "$CONFIGFILE" ]; then
+    while IFS=" = " read -r key value; do
+        config["$key"]="$value"
+    done < "$CONFIGFILE"
+fi
+
+# Set interface from config if not set by parameter
+if [ -z "$interface" ] && [ -n "${config[WifiInterface]}" ]; then
+    interface="${config[WifiInterface]}"
+    echo "Interface not provided. Using WifiInterface from config: $interface"
+fi
+
 echo "Stopping network services..."
 if [ $OPENVPNENABLED -eq 1 ]; then
     systemctl stop openvpn-client@client
@@ -49,18 +63,12 @@ if [ "${action}" = "stop" ]; then
     exit 0
 fi
 
-if [ -f "$DAEMONPATH" ] && [ ! -z "$interface" ]; then
+if [ -f "$DAEMONPATH" ] && [ -n "$interface" ]; then
     echo "Changing RaspAP Daemon --interface to $interface"
     sed -i "s/\(--interface \)[[:alnum:]]*/\1$interface/" "$DAEMONPATH"
 fi
 
-if [ -r "$CONFIGFILE" ]; then
-    declare -A config
-    while IFS=" = " read -r key value; do
-        config["$key"]="$value"
-    done < "$CONFIGFILE"
-
-    if [ "${config[BridgedEnable]}" = 1 ]; then
+if [ "${config[BridgedEnable]}" = 1 ]; then
     if [ "${interface}" = "br0" ]; then
         echo "Stopping systemd-networkd"
         systemctl stop systemd-networkd
@@ -76,7 +84,7 @@ if [ -r "$CONFIGFILE" ]; then
         systemctl start systemd-networkd
         systemctl enable systemd-networkd
     fi
-    else
+else
     echo "Disabling systemd-networkd"
     systemctl disable systemd-networkd
 
@@ -102,7 +110,6 @@ if [ -r "$CONFIGFILE" ]; then
             ifconfig uap0 up
         fi
     fi
-    fi
 fi
 
 # Start services, mitigating race conditions
@@ -122,8 +129,6 @@ if [ $OPENVPNENABLED -eq 1 ]; then
     systemctl start openvpn-client@client
 fi
 
-# @mp035 found that the wifi client interface would stop every 8 seconds
-# for about 16 seconds. Reassociating seems to solve this
 if [ "${config[WifiAPEnable]}" = 1 ]; then
     echo "Reassociating wifi client interface..."
     sleep "${seconds}"