diff options
| author | Christian Lamparter <chunkeey@googlemail.com> | 2016-10-17 15:59:13 +0200 |
|---|---|---|
| committer | Felix Fietkau <nbd@nbd.name> | 2016-11-03 11:08:01 +0100 |
| commit | 5e35b4562fb73aaa1c75a3404fed2efb6afe03f8 (patch) | |
| tree | 6158914891186bf0015814228d513d7693da2c61 /package/base-files/files/etc/init.d | |
| parent | ba3540db6223a0107fd78decafea702a0537af7a (diff) | |
| download | upstream-5e35b4562fb73aaa1c75a3404fed2efb6afe03f8.tar.gz upstream-5e35b4562fb73aaa1c75a3404fed2efb6afe03f8.tar.bz2 upstream-5e35b4562fb73aaa1c75a3404fed2efb6afe03f8.zip | |
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>
Diffstat (limited to 'package/base-files/files/etc/init.d')
| -rwxr-xr-x | package/base-files/files/etc/init.d/boot | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/package/base-files/files/etc/init.d/boot b/package/base-files/files/etc/init.d/boot index 904f7db75e..03b0fa0419 100755 --- a/package/base-files/files/etc/init.d/boot +++ b/package/base-files/files/etc/init.d/boot @@ -41,11 +41,7 @@ boot() { # allow wifi modules time to settle sleep 1 - /sbin/wifi detect > /tmp/wireless.tmp - [ -s /tmp/wireless.tmp ] && { - cat /tmp/wireless.tmp >> /etc/config/wireless - } - rm -f /tmp/wireless.tmp + /sbin/wifi detect /bin/config_generate uci_apply_defaults |