From 547ab7fbc7a641a4140b918b4d413a5c507741c1 Mon Sep 17 00:00:00 2001 From: viktorxda Date: Fri, 28 Apr 2023 17:32:58 +0200 Subject: [PATCH] wireless-configuration: set timeout for accesspoint --- general/package/busybox/busybox.config | 4 ++-- .../wireless-configuration/files/script/adapter | 2 ++ .../wireless-configuration/files/script/wireless | 15 +++++++++++---- 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/general/package/busybox/busybox.config b/general/package/busybox/busybox.config index 7a0dbeca..4f4f2da0 100644 --- a/general/package/busybox/busybox.config +++ b/general/package/busybox/busybox.config @@ -313,7 +313,7 @@ CONFIG_TEST=y CONFIG_TEST1=y CONFIG_TEST2=y CONFIG_FEATURE_TEST_64=y -# CONFIG_TIMEOUT is not set +CONFIG_TIMEOUT=y CONFIG_TOUCH=y # CONFIG_FEATURE_TOUCH_NODEREF is not set CONFIG_FEATURE_TOUCH_SUSV3=y @@ -785,7 +785,7 @@ CONFIG_I2CSET=y CONFIG_I2CDUMP=y CONFIG_I2CDETECT=y CONFIG_I2CTRANSFER=y -CONFIG_INOTIFYD=y +# CONFIG_INOTIFYD is not set CONFIG_LESS=y CONFIG_FEATURE_LESS_MAXLINES=9999999 CONFIG_FEATURE_LESS_BRACKETS=y diff --git a/general/package/wireless-configuration/files/script/adapter b/general/package/wireless-configuration/files/script/adapter index b8c1d276..2093cab7 100755 --- a/general/package/wireless-configuration/files/script/adapter +++ b/general/package/wireless-configuration/files/script/adapter @@ -12,6 +12,7 @@ if [ "$SOC" == "hi3516ev300" ]; then echo 7 > /sys/class/gpio/export echo out > /sys/class/gpio/gpio7/direction echo 0 > /sys/class/gpio/gpio7/value + echo 7 > /sys/class/gpio/unexport modprobe mt7601usta fi @@ -20,5 +21,6 @@ if [ "$SOC" == "t21" ]; then echo 50 > /sys/class/gpio/export echo out > /sys/class/gpio/gpio50/direction echo 0 > /sys/class/gpio/gpio50/value + echo 50 > /sys/class/gpio/unexport modprobe 8188fu fi diff --git a/general/package/wireless-configuration/files/script/wireless b/general/package/wireless-configuration/files/script/wireless index b09e5d6e..ba5ec52d 100755 --- a/general/package/wireless-configuration/files/script/wireless +++ b/general/package/wireless-configuration/files/script/wireless @@ -19,14 +19,21 @@ case "$PHASE" in pre-up) /etc/network/adapter wpa_passphrase "$WPA_SSID" "$WPA_PASS" > $WPA_TEMP - [ "$WPA_MODE" = "client" ] && sed -i '2i \\tscan_ssid=1' $WPA_TEMP - [ "$WPA_MODE" = "server" ] && sed -i '2i \\tmode=2' $WPA_TEMP + if [ "$WPA_MODE" = "server" ]; then + sed -i '2i \\tmode=2' $WPA_TEMP + else + sed -i '2i \\tscan_ssid=1' $WPA_TEMP + fi exit 0 ;; post-up) - wpa_supplicant -B -i wlan0 -c $WPA_TEMP - [ "$WPA_MODE" = "server" ] && udhcpd + if [ "$WPA_MODE" = "server" ]; then + timeout 3m udhcpd -f &> /dev/null & + timeout 3m wpa_supplicant -i wlan0 -c $WPA_TEMP &> /dev/null & + else + wpa_supplicant -B -i wlan0 -c $WPA_TEMP + fi exit 0 ;;