aboutsummaryrefslogtreecommitdiffstats
path: root/package/base-files
diff options
context:
space:
mode:
Diffstat (limited to 'package/base-files')
-rwxr-xr-xpackage/base-files/files/etc/init.d/boot8
-rwxr-xr-xpackage/base-files/files/sbin/wifi5
2 files changed, 7 insertions, 6 deletions
diff --git a/package/base-files/files/etc/init.d/boot b/package/base-files/files/etc/init.d/boot
index 03b0fa0419..31f245ffc7 100755
--- a/package/base-files/files/etc/init.d/boot
+++ b/package/base-files/files/etc/init.d/boot
@@ -38,10 +38,10 @@ boot() {
/sbin/kmodloader
- # allow wifi modules time to settle
- sleep 1
-
- /sbin/wifi detect
+ [ ! -f /etc/config/wireless ] && {
+ # compat for brcm47xx and mvebu
+ sleep 1
+ }
/bin/config_generate
uci_apply_defaults
diff --git a/package/base-files/files/sbin/wifi b/package/base-files/files/sbin/wifi
index 2ef333a782..f2845c82f6 100755
--- a/package/base-files/files/sbin/wifi
+++ b/package/base-files/files/sbin/wifi
@@ -145,7 +145,7 @@ wifi_reload() {
wifi_reload_legacy
}
-wifi_detect() {
+wifi_config() {
[ ! -f /etc/config/wireless ] && touch /etc/config/wireless
for driver in $DRIVERS; do (
@@ -229,7 +229,8 @@ scan_wifi
case "$1" in
down) wifi_updown "disable" "$2";;
- detect) wifi_detect ;;
+ detect) ;;
+ config) wifi_config ;;
status) ubus_wifi_cmd "status" "$2";;
reload) wifi_reload "$2";;
reload_legacy) wifi_reload_legacy "$2";;