[PATCH v2 09/10] fff-wireless: Move antenna gain and rssileds setup to scripts
mail at adrianschmutzler.de
mail at adrianschmutzler.de
Mo Apr 22 13:39:16 CEST 2019
Hallo Christian,
selbe Argumentation wie zuvor:
uci-defaults werden geschrieben, bevor das Netzwerk gestartet wird. Zudem gibt es am Schluss ohnehin nochmal einen reload_config in der /etc/init.d/boot.
Wenn die wireless-Devices dann gestartet werden, ist alles von Anfang an richtig gesetzt, und man muss nichts ändern. (Mal abgesehen davon, dass wir die mit dem aktuellen FW-Stand eh dann noch drölf mal wieder löschen und neu bauen.)
Grüße
Adrian
> -----Original Message-----
> From: Christian Dresel [mailto:fff at chrisi01.de]
> Sent: Montag, 22. April 2019 09:47
> To: Adrian Schmutzler <freifunk at adrianschmutzler.de>; franken-
> dev at freifunk.net
> Subject: Re: [PATCH v2 09/10] fff-wireless: Move antenna gain and rssileds
> setup to scripts
>
> hi
>
> Acked-by: Christian Dresel <fff at chrisi01.de>
>
> Frage:
> Werden Wifi Settings übernommen wenn man "nur" uci commit wireless"
> macht? Ich glaube fast das ein reload_config und/oder wifi nötig ist?
>
> Review kommt sobald as geklärt ist
>
> Gruß
>
> Christian
>
> On 14.04.19 01:25, Adrian Schmutzler wrote:
> > This reorganizes the WiFi adjustments in a similar way as the network
> > init stuff. This should be more convenient.
> >
> > Signed-off-by: Adrian Schmutzler <freifunk at adrianschmutzler.de>
> >
> > ---
> >
> > Changes in v2:
> > - Remove -q
> > - Patch sequence number +1
> > ---
> > src/packages/fff/fff-wireless/Makefile | 2 +-
> > .../{60-fff-wireless => 20a-fff-wireless} | 0
> > .../files/etc/uci-defaults/20b-config-wireless | 52
> ++++++++++++++++++++++
> > .../files/etc/uci-defaults/62-config-wireless | 9 ----
> > .../fff/fff-wireless/files/etc/wifi.cpe210-v2 | 2 -
> > .../fff/fff-wireless/files/etc/wifi.cpe210-v3 | 2 -
> > .../fff/fff-wireless/files/etc/wifi.tl-wr1043nd-v1 | 2 -
> > .../fff/fff-wireless/files/etc/wifi.ubnt-loco-m | 2 -
> > .../fff/fff-wireless/files/etc/wifi.ubnt-loco-m-xw | 2 -
> > .../fff/fff-wireless/files/etc/wifi.ubnt-nano-m | 2 -
> > .../fff/fff-wireless/files/etc/wifi.ubnt-pico-m | 2 -
> > .../fff-wireless/files/etc/wifi.ubnt-power-m-xw | 2 -
> > .../fff/fff-wireless/files/etc/wifi.ubnt-unifi | 3 --
> > .../fff-wireless/files/etc/wifi.ubnt-unifiac-lite | 3 --
> > 14 files changed, 53 insertions(+), 32 deletions(-) rename
> > src/packages/fff/fff-wireless/files/etc/uci-defaults/{60-fff-wireless
> > => 20a-fff-wireless} (100%) create mode 100644
> > src/packages/fff/fff-wireless/files/etc/uci-defaults/20b-config-wirele
> > ss delete mode 100644
> > src/packages/fff/fff-wireless/files/etc/uci-defaults/62-config-wireles
> > s delete mode 100644
> > src/packages/fff/fff-wireless/files/etc/wifi.cpe210-v2
> > delete mode 100644
> > src/packages/fff/fff-wireless/files/etc/wifi.cpe210-v3
> > delete mode 100644
> > src/packages/fff/fff-wireless/files/etc/wifi.tl-wr1043nd-v1
> > delete mode 100644
> > src/packages/fff/fff-wireless/files/etc/wifi.ubnt-loco-m
> > delete mode 100644
> > src/packages/fff/fff-wireless/files/etc/wifi.ubnt-loco-m-xw
> > delete mode 100644
> > src/packages/fff/fff-wireless/files/etc/wifi.ubnt-nano-m
> > delete mode 100644
> > src/packages/fff/fff-wireless/files/etc/wifi.ubnt-pico-m
> > delete mode 100644
> > src/packages/fff/fff-wireless/files/etc/wifi.ubnt-power-m-xw
> > delete mode 100644
> > src/packages/fff/fff-wireless/files/etc/wifi.ubnt-unifi
> > delete mode 100644
> > src/packages/fff/fff-wireless/files/etc/wifi.ubnt-unifiac-lite
> >
> > diff --git a/src/packages/fff/fff-wireless/Makefile
> > b/src/packages/fff/fff-wireless/Makefile
> > index 5a478409..6c0b6a9b 100644
> > --- a/src/packages/fff/fff-wireless/Makefile
> > +++ b/src/packages/fff/fff-wireless/Makefile
> > @@ -1,7 +1,7 @@
> > include $(TOPDIR)/rules.mk
> >
> > PKG_NAME:=fff-wireless
> > -PKG_RELEASE:=7
> > +PKG_RELEASE:=8
> >
> > PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
> >
> > diff --git
> > a/src/packages/fff/fff-wireless/files/etc/uci-defaults/60-fff-wireless
> > b/src/packages/fff/fff-wireless/files/etc/uci-defaults/20a-fff-wireles
> > s
> > similarity index 100%
> > rename from
> > src/packages/fff/fff-wireless/files/etc/uci-defaults/60-fff-wireless
> > rename to
> > src/packages/fff/fff-wireless/files/etc/uci-defaults/20a-fff-wireless
> > diff --git
> > a/src/packages/fff/fff-wireless/files/etc/uci-defaults/20b-config-wire
> > less
> > b/src/packages/fff/fff-wireless/files/etc/uci-defaults/20b-config-wire
> > less
> > new file mode 100644
> > index 00000000..c58ded1c
> > --- /dev/null
> > +++ b/src/packages/fff/fff-wireless/files/etc/uci-defaults/20b-config-
> > +++ wireless
> > @@ -0,0 +1,52 @@
> > +#!/bin/sh
> > +# Copyright 2018 Adrian Schmutzler
> > +# License GPLv3
> > +
> > +BOARD="$(uci get board.model.name)"
> > +
> > +# antenna gain
> > +case "$BOARD" in
> > + tl-wr1043nd-v1)
> > + uci set wireless.radio0.antenna_gain=3
> > + uci commit wireless
> > + ;;
> > + ubnt-loco-m|\
> > + ubnt-loco-m-xw)
> > + uci set wireless.radio0.antenna_gain=9
> > + uci commit wireless
> > + ;;
> > + ubnt-nano-m)
> > + uci set wireless.radio0.antenna_gain=11
> > + uci commit wireless
> > + ;;
> > + ubnt-pico-m)
> > + uci set wireless.radio0.antenna_gain=12
> > + uci commit wireless
> > + ;;
> > + ubnt-power-m-xw)
> > + uci set wireless.radio0.antenna_gain=18
> > + uci commit wireless
> > + ;;
> > + ubnt-unifi)
> > + # No support for Unifi AP Pro!
> > + uci set wireless.radio0.antenna_gain=3
> > + uci commit wireless
> > + ;;
> > + ubnt-unifiac-mesh)
> > + uci set wireless.radio0.antenna_gain=4
> > + uci set wireless.radio1.antenna_gain=3
> > + uci commit wireless
> > + ;;
> > +esac
> > +
> > +# rssid
> > +case "$BOARD" in
> > + cpe210|\
> > + cpe210-v2|\
> > + cpe210-v3|\
> > + cpe510|\
> > + tl-wa850re-v1)
> > + uci set system.rssid_wlan0.dev=radio0
> > + uci commit system
> > + ;;
> > +esac
> > diff --git
> > a/src/packages/fff/fff-wireless/files/etc/uci-defaults/62-config-wirel
> > ess
> > b/src/packages/fff/fff-wireless/files/etc/uci-defaults/62-config-wirel
> > ess
> > deleted file mode 100644
> > index f900b2c0..00000000
> > ---
> > a/src/packages/fff/fff-wireless/files/etc/uci-defaults/62-config-wirel
> > ess
> > +++ /dev/null
> > @@ -1,9 +0,0 @@
> > -#!/bin/sh
> > -# Copyright 2018 Adrian Schmutzler
> > -# License GPLv3
> > -
> > -BOARD="$(uci get board.model.name)"
> > -
> > -if [ -s "/etc/wifi.$BOARD" ] ; then
> > - . "/etc/wifi.$BOARD"
> > -fi
> > diff --git a/src/packages/fff/fff-wireless/files/etc/wifi.cpe210-v2
> > b/src/packages/fff/fff-wireless/files/etc/wifi.cpe210-v2
> > deleted file mode 100644
> > index 3a5f3c49..00000000
> > --- a/src/packages/fff/fff-wireless/files/etc/wifi.cpe210-v2
> > +++ /dev/null
> > @@ -1,2 +0,0 @@
> > -uci -q set system.rssid_wlan0.dev=radio0 -uci -q commit system diff
> > --git a/src/packages/fff/fff-wireless/files/etc/wifi.cpe210-v3
> > b/src/packages/fff/fff-wireless/files/etc/wifi.cpe210-v3
> > deleted file mode 100644
> > index 3a5f3c49..00000000
> > --- a/src/packages/fff/fff-wireless/files/etc/wifi.cpe210-v3
> > +++ /dev/null
> > @@ -1,2 +0,0 @@
> > -uci -q set system.rssid_wlan0.dev=radio0 -uci -q commit system diff
> > --git a/src/packages/fff/fff-wireless/files/etc/wifi.tl-wr1043nd-v1
> > b/src/packages/fff/fff-wireless/files/etc/wifi.tl-wr1043nd-v1
> > deleted file mode 100644
> > index f1a7017f..00000000
> > --- a/src/packages/fff/fff-wireless/files/etc/wifi.tl-wr1043nd-v1
> > +++ /dev/null
> > @@ -1,2 +0,0 @@
> > -uci -q set wireless.radio0.antenna_gain=3 -uci -q commit wireless
> > diff --git a/src/packages/fff/fff-wireless/files/etc/wifi.ubnt-loco-m
> > b/src/packages/fff/fff-wireless/files/etc/wifi.ubnt-loco-m
> > deleted file mode 100644
> > index 3c5110e4..00000000
> > --- a/src/packages/fff/fff-wireless/files/etc/wifi.ubnt-loco-m
> > +++ /dev/null
> > @@ -1,2 +0,0 @@
> > -uci -q set wireless.radio0.antenna_gain=9 -uci -q commit wireless
> > diff --git
> > a/src/packages/fff/fff-wireless/files/etc/wifi.ubnt-loco-m-xw
> > b/src/packages/fff/fff-wireless/files/etc/wifi.ubnt-loco-m-xw
> > deleted file mode 100644
> > index 3c5110e4..00000000
> > --- a/src/packages/fff/fff-wireless/files/etc/wifi.ubnt-loco-m-xw
> > +++ /dev/null
> > @@ -1,2 +0,0 @@
> > -uci -q set wireless.radio0.antenna_gain=9 -uci -q commit wireless
> > diff --git a/src/packages/fff/fff-wireless/files/etc/wifi.ubnt-nano-m
> > b/src/packages/fff/fff-wireless/files/etc/wifi.ubnt-nano-m
> > deleted file mode 100644
> > index 8b44ac83..00000000
> > --- a/src/packages/fff/fff-wireless/files/etc/wifi.ubnt-nano-m
> > +++ /dev/null
> > @@ -1,2 +0,0 @@
> > -uci -q set wireless.radio0.antenna_gain=11 -uci -q commit wireless
> > diff --git a/src/packages/fff/fff-wireless/files/etc/wifi.ubnt-pico-m
> > b/src/packages/fff/fff-wireless/files/etc/wifi.ubnt-pico-m
> > deleted file mode 100644
> > index 2cac5233..00000000
> > --- a/src/packages/fff/fff-wireless/files/etc/wifi.ubnt-pico-m
> > +++ /dev/null
> > @@ -1,2 +0,0 @@
> > -uci -q set wireless.radio0.antenna_gain=12 -uci -q commit wireless
> > diff --git
> > a/src/packages/fff/fff-wireless/files/etc/wifi.ubnt-power-m-xw
> > b/src/packages/fff/fff-wireless/files/etc/wifi.ubnt-power-m-xw
> > deleted file mode 100644
> > index 9d3ff906..00000000
> > --- a/src/packages/fff/fff-wireless/files/etc/wifi.ubnt-power-m-xw
> > +++ /dev/null
> > @@ -1,2 +0,0 @@
> > -uci -q set wireless.radio0.antenna_gain=18 -uci -q commit wireless
> > diff --git a/src/packages/fff/fff-wireless/files/etc/wifi.ubnt-unifi
> > b/src/packages/fff/fff-wireless/files/etc/wifi.ubnt-unifi
> > deleted file mode 100644
> > index 903c7b6a..00000000
> > --- a/src/packages/fff/fff-wireless/files/etc/wifi.ubnt-unifi
> > +++ /dev/null
> > @@ -1,3 +0,0 @@
> > -# No support for Unifi AP Pro!
> > -uci -q set wireless.radio0.antenna_gain=3 -uci -q commit wireless
> > diff --git
> > a/src/packages/fff/fff-wireless/files/etc/wifi.ubnt-unifiac-lite
> > b/src/packages/fff/fff-wireless/files/etc/wifi.ubnt-unifiac-lite
> > deleted file mode 100644
> > index 9b4438d9..00000000
> > --- a/src/packages/fff/fff-wireless/files/etc/wifi.ubnt-unifiac-lite
> > +++ /dev/null
> > @@ -1,3 +0,0 @@
> > -uci -q set wireless.radio0.antenna_gain=4 -uci -q set
> > wireless.radio1.antenna_gain=3 -uci -q commit wireless
-------------- nächster Teil --------------
Ein Dateianhang mit Binärdaten wurde abgetrennt...
Dateiname : nicht verfügbar
Dateityp : application/pgp-signature
Dateigröße : 834 bytes
Beschreibung: nicht verfügbar
URL : <https://{'listname': 'franken-dev-freifunk.net', 'hostname': 'lists.freifunk.net'}/pipermail/franken-dev-freifunk.net/attachments/20190422/666a84a0/attachment.sig>
Mehr Informationen über die Mailingliste franken-dev