From ad74aaf1888556f446a93a13d1e5c017329ab987 Mon Sep 17 00:00:00 2001
From: Ing <wjz304@qq.com>
Date: Wed, 19 Feb 2025 17:50:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=97=A0=E7=BA=BF=E7=BD=91?=
 =?UTF-8?q?=E7=BB=9C=E8=BF=9E=E6=8E=A5=E9=80=BB=E8=BE=91=EF=BC=8C=E9=81=BF?=
 =?UTF-8?q?=E5=85=8D=E9=87=8D=E5=A4=8D=E6=9D=80=E6=AD=BB=20wpa=5Fsupplican?=
 =?UTF-8?q?t=20=E8=BF=9B=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 files/initrd/opt/rr/include/functions.sh | 6 +-----
 files/initrd/opt/rr/menu.sh              | 1 +
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/files/initrd/opt/rr/include/functions.sh b/files/initrd/opt/rr/include/functions.sh
index 1109cc7f..9d939874 100755
--- a/files/initrd/opt/rr/include/functions.sh
+++ b/files/initrd/opt/rr/include/functions.sh
@@ -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
diff --git a/files/initrd/opt/rr/menu.sh b/files/initrd/opt/rr/menu.sh
index bac496ba..ee24fad0 100755
--- a/files/initrd/opt/rr/menu.sh
+++ b/files/initrd/opt/rr/menu.sh
@@ -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}")"