Autres/RaspAP
1
0
Fork 0
mirror of https://github.com/billz/raspap-webgui.git synced 2025-07-27 09:39:27 +02:00
Code Issues Releases Wiki Activity

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

Browse Source
This commit is contained in:
billz 2025-04-28 00:47:16 -07:00
parent 5d8b71b768
commit 0ad82da51c
2 changed files with 49 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
installers/raspapd.service
View File

@ -16,7 +16,7 @@ After=multi-user.target
[Service] [Service]
Type=oneshot 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 RemainAfterExit=no
[Install] [Install]

25
installers/servicestart.sh
View File

@ -34,6 +34,20 @@ esac
done done
set -- "${positional[@]}" 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..." echo "Stopping network services..."
if [ $OPENVPNENABLED -eq 1 ]; then if [ $OPENVPNENABLED -eq 1 ]; then
systemctl stop openvpn-client@client systemctl stop openvpn-client@client
@ -49,17 +63,11 @@ if [ "${action}" = "stop" ]; then
exit 0 exit 0
fi fi
if [ -f "$DAEMONPATH" ] && [ ! -z "$interface" ]; then if [ -f "$DAEMONPATH" ] && [ -n "$interface" ]; then
echo "Changing RaspAP Daemon --interface to $interface" echo "Changing RaspAP Daemon --interface to $interface"
sed -i "s/\(--interface \)[[:alnum:]]*/\1$interface/" "$DAEMONPATH" sed -i "s/\(--interface \)[[:alnum:]]*/\1$interface/" "$DAEMONPATH"
fi 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 if [ "${interface}" = "br0" ]; then
echo "Stopping systemd-networkd" echo "Stopping systemd-networkd"
@ -103,7 +111,6 @@ if [ -r "$CONFIGFILE" ]; then
fi fi
fi fi
fi fi
fi
# Start services, mitigating race conditions # Start services, mitigating race conditions
echo "Starting network services..." echo "Starting network services..."
@ -122,8 +129,6 @@ if [ $OPENVPNENABLED -eq 1 ]; then
systemctl start openvpn-client@client systemctl start openvpn-client@client
fi 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 if [ "${config[WifiAPEnable]}" = 1 ]; then
echo "Reassociating wifi client interface..." echo "Reassociating wifi client interface..."
sleep "${seconds}" sleep "${seconds}"