yuan/RROrg-rr
1
0
Fork 0
mirror of https://github.com/RROrg/rr.git synced 2025-06-21 05:51:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

优化无线网络连接逻辑，避免重复杀死 wpa_supplicant 进程

Browse Source
This commit is contained in:
Ing 2025-02-19 17:50:53 +08:00
parent 4c4ae4e0ff
commit ad74aaf188
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
files/initrd/opt/rr/include/functions.sh
View File

@ -422,11 +422,7 @@ function connectwlanif() {
else
local CONF="$([ -f "${PART1_PATH}/wpa_supplicant.conf" ] && echo "${PART1_PATH}/wpa_supplicant.conf" || echo "")"
[ -z "${CONF}" ] && return 2
if [ -f "/var/run/wpa_supplicant.pid.${1}" ]; then
kill -9 "$(cat /var/run/wpa_supplicant.pid.${1})"
rm -f "/var/run/wpa_supplicant.pid.${1}"
fi
[ -f "/var/run/wpa_supplicant.pid.${1}" ] && return 0
wpa_supplicant -i "${1}" -c "${CONF}" -qq -B -P "/var/run/wpa_supplicant.pid.${1}" >/dev/null 2>&1
fi
return 0

1
files/initrd/opt/rr/menu.sh
View File

@ -2632,6 +2632,7 @@ function setWirelessAccount() {
else
echo -e "ctrl_interface=/var/run/wpa_supplicant\nupdate_config=1\nnetwork={\n ssid=\"${SSID}\"\n priority=1\n psk=\"${PSK}\"\n}" >${PART1_PATH}/wpa_supplicant.conf
for N in ${ETHX}; do
connectwlanif "${N}" 0 && sleep 1
connectwlanif "${N}" 1 && sleep 1
MACR="$(cat /sys/class/net/${N}/address 2>/dev/null | sed 's/://g')"
IPR="$(readConfigKey "network.${MACR}" "${USER_CONFIG_FILE}")"