[PATCH 11/11] fff-bastman-adv-legacy: do not overwrite config

mayosemmel mayosemmel at googlemail.com
Do Jun 9 14:11:35 CEST 2016


Reviewed-by: Jan Kraus <mayosemmel at gmail.com>

Am Mittwoch, den 08.06.2016, 18:29 +0200 schrieb Tim Niemeyer:
> In some cases the original file "wins" and our config is lost.
> 
> Signed-off-by: Tim Niemeyer <tim at tn-x.org>
> ---
> 
>  .../fff/fff-batman-adv-legacy/files/etc/config/batman-adv | 15 ---------------
>  .../files/etc/uci-defaults/80-fff-batman-adv-legacy       |  8 ++++++++
>  2 files changed, 8 insertions(+), 15 deletions(-)
>  delete mode 100644 src/packages/fff/fff-batman-adv-legacy/files/etc/config/batman-adv
>  create mode 100644 src/packages/fff/fff-batman-adv-legacy/files/etc/uci-defaults/80-fff-batman-adv-legacy
> 
> diff --git a/src/packages/fff/fff-batman-adv-legacy/files/etc/config/batman-adv b/src/packages/fff/fff-batman-adv-legacy/files/etc/config/batman-adv
> deleted file mode 100644
> index b633327..0000000
> --- a/src/packages/fff/fff-batman-adv-legacy/files/etc/config/batman-adv
> +++ /dev/null
> @@ -1,15 +0,0 @@
> -config mesh bat0
> -    option aggregated_ogms
> -    option ap_isolation
> -    option bonding
> -    option fragmentation
> -    option gw_bandwidth
> -    option gw_mode client
> -    option gw_sel_class 1
> -    option log_level
> -    option orig_interval
> -    option vis_mode
> -    option bridge_loop_avoidance 0
> -    option distributed_arp_table
> -    option network_coding 0
> -    option hop_penalty
> diff --git a/src/packages/fff/fff-batman-adv-legacy/files/etc/uci-defaults/80-fff-batman-adv-legacy b/src/packages/fff/fff-batman-adv-legacy/files/etc/uci-defaults/80-fff-batman-adv-legacy
> new file mode 100644
> index 0000000..745ac4e
> --- /dev/null
> +++ b/src/packages/fff/fff-batman-adv-legacy/files/etc/uci-defaults/80-fff-batman-adv-legacy
> @@ -0,0 +1,8 @@
> +#!/bin/sh
> +
> +uci batch <<EOF
> +set batman-adv.bat0.gw_sel_class='1'
> +set batman-adv.bat0.bridge_loop_avoidance='1'
> +set batman-adv.bat0.network_coding='0'
> +commit batman-adv
> +EOF
> -- 
> 2.1.4
> 

-------------- nächster Teil --------------
Ein Dateianhang mit Binärdaten wurde abgetrennt...
Dateiname   : signature.asc
Dateityp    : application/pgp-signature
Dateigröße  : 473 bytes
Beschreibung: This is a digitally signed message part
URL         : <http://lists.freifunk.net/pipermail/franken-dev-freifunk.net/attachments/20160609/bc546e0a/attachment-0001.sig>


Mehr Informationen über die Mailingliste franken-dev