base-files, mac80211, broadcom-wl: use uci to populate wireless config
Previously, wifi detect simply dumped its generated wireless
configuration to STDOUT. A second step was needed to append
the configuration to /etc/config/wireless (or create it, if
it didn't exist).
With this patch, The wifi detection script will now use uci
to update the wireless configuration directly.
This patch also makes the initially created wifi-iface a
named section ('default_radio$X' for mac80211 and
'default_wl$X' for broadcom). With this change, uci will
not print the cfgHASH to STDOUT (which would now corrupt
the wireless configuration). It will also prevent adding
duplicated wifi interface configurations, if the wifi
configuration is run concurrently.
Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
This commit is contained in:
committed by
Felix Fietkau
parent
ba3540db62
commit
5e35b4562f
@@ -456,22 +456,22 @@ detect_broadcom() {
|
||||
config_get type wl${i} type
|
||||
[ "$type" = broadcom ] && continue
|
||||
channel=`wlc ifname wl${i} channel`
|
||||
cat <<EOF
|
||||
config wifi-device wl${i}
|
||||
option type broadcom
|
||||
option channel ${channel:-11}
|
||||
option txantenna 3
|
||||
option rxantenna 3
|
||||
# REMOVE THIS LINE TO ENABLE WIFI:
|
||||
option disabled 1
|
||||
|
||||
config wifi-iface
|
||||
option device wl${i}
|
||||
option network lan
|
||||
option mode ap
|
||||
option ssid Lede${i#0}
|
||||
option encryption none
|
||||
uci -q batch <<-EOF
|
||||
set wireless.wl${i}=wifi-device
|
||||
set wireless.wl${i}.type=broadcom
|
||||
set wireless.wl${i}.channel=${channel:-11}
|
||||
set wireless.wl${i}.txantenna=3
|
||||
set wireless.wl${i}.rxantenna=3
|
||||
set wireless.wl${i}.disabled=1
|
||||
|
||||
set wireless.default_wl${i}=wifi-iface
|
||||
set wireless.default_wl${i}.device=wl${i}
|
||||
set wireless.default_wl${i}.network=lan
|
||||
set wireless.default_wl${i}.mode=ap
|
||||
set wireless.default_wl${i}.ssid=Lede${i#0}
|
||||
set wireless.default_wl${i}.encryption=none
|
||||
EOF
|
||||
uci -q commit wireless
|
||||
done
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user