[3/3] makes batman-adv config a uci-defaults script

Submitted by Tobias Klaus on June 8, 2016, 8:24 a.m.

Details

Message ID 20160608082409.5161-4-tk+ff@meskal.net
State Accepted, archived
Commit d253a1be75c65d882295fa3fd5a99f156ad4942d
Headers show

Commit Message

Tobias Klaus June 8, 2016, 8:24 a.m. 
Signed-off-by: Tobias Klaus <tk+ff@meskal.net>
---
 .../files/etc/config/batman-adv                    | 15 ---------------
 .../files/etc/uci-defaults/93-fff-batman-adv       | 22 ++++++++++++++++++++++
 2 files changed, 22 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/93-fff-batman-adv

Patch hide | download patch | download mbox 

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/93-fff-batman-adv b/src/packages/fff/fff-batman-adv-legacy/files/etc/uci-defaults/93-fff-batman-adv
new file mode 100644
index 0000000..9bc3928
--- /dev/null
+++ b/src/packages/fff/fff-batman-adv-legacy/files/etc/uci-defaults/93-fff-batman-adv
@@ -0,0 +1,22 @@ 
+#!/bin/sh
+
+uci batch <<EOF
+  delete batman-adv.bat0
+  set batman-adv.bat0=mesh
+  set batman-adv.bat0.gw_mode='client'
+  set batman-adv.bat0.gw_sel_class='1'
+  set batman-adv.bat0.bridge_loop_avoidance='0'
+  set batman-adv.bat0.network_coding='0'
+  set batman-adv.bat0.aggregated_ogms='1'
+  set batman-adv.bat0.ap_isolation='0'
+  set batman-adv.bat0.bonding='0'
+  set batman-adv.bat0.fragmentation='1'
+  set batman-adv.bat0.orig_interval='1000'
+  set batman-adv.bat0.vis_mode='0'
+  set batman-adv.bat0.distributed_arp_table='1'
+  set batman-adv.bat0.hop_penalty='30'
+EOF
+
+uci commit
+
+exit 0

Comments

Jan Kraus June 9, 2016, 12:18 p.m. 
Hallo Tobias,

Ist in Tims patch etwas schöner, weil die defaults nicht mehr explizit
gesetzt werden.
Ansonsten gäbe es auch einen review.

Grüße Jan
Am Mittwoch, den 08.06.2016, 10:24 +0200 schrieb Tobias Klaus:
> Signed-off-by: Tobias Klaus <tk+ff@meskal.net>
> ---
>  .../files/etc/config/batman-adv                    | 15 ---------------
>  .../files/etc/uci-defaults/93-fff-batman-adv       | 22 ++++++++++++++++++++++
>  2 files changed, 22 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/93-fff-batman-adv
> 
> 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/93-fff-batman-adv b/src/packages/fff/fff-batman-adv-legacy/files/etc/uci-defaults/93-fff-batman-adv
> new file mode 100644
> index 0000000..9bc3928
> --- /dev/null
> +++ b/src/packages/fff/fff-batman-adv-legacy/files/etc/uci-defaults/93-fff-batman-adv
> @@ -0,0 +1,22 @@
> +#!/bin/sh
> +
> +uci batch <<EOF
> +  delete batman-adv.bat0
> +  set batman-adv.bat0=mesh
> +  set batman-adv.bat0.gw_mode='client'
> +  set batman-adv.bat0.gw_sel_class='1'
> +  set batman-adv.bat0.bridge_loop_avoidance='0'
> +  set batman-adv.bat0.network_coding='0'
> +  set batman-adv.bat0.aggregated_ogms='1'
> +  set batman-adv.bat0.ap_isolation='0'
> +  set batman-adv.bat0.bonding='0'
> +  set batman-adv.bat0.fragmentation='1'
> +  set batman-adv.bat0.orig_interval='1000'
> +  set batman-adv.bat0.vis_mode='0'
> +  set batman-adv.bat0.distributed_arp_table='1'
> +  set batman-adv.bat0.hop_penalty='30'
> +EOF
> +
> +uci commit
> +
> +exit 0
> -- 
> 2.8.3
>
Tobias Klaus June 9, 2016, 12:27 p.m. 
Hallo Jan,

danke für deine Reviews.

Ich hab hier explizit die defaults gesetzt um eben den status quo auch zu 
dokumentieren und um die defaults in "unseren" Hoheitsbereich zu verschieben.

Wenn wir so etwas wie "network coding"[] aktivieren möchten, sollten wir das 
explizit(und in unserem Repo sichtbar) machen und nicht durch ein batman-
Update, das plötzlich andere Defaults verwendet.

Grüße
Tobias

Am Donnerstag, 9. Juni 2016, 14:18:54 CEST schrieb mayosemmel:
> Hallo Tobias,
> 
> Ist in Tims patch etwas schöner, weil die defaults nicht mehr explizit
> gesetzt werden.
> Ansonsten gäbe es auch einen review.
> 
> Grüße Jan
> 
> Am Mittwoch, den 08.06.2016, 10:24 +0200 schrieb Tobias Klaus:
> > Signed-off-by: Tobias Klaus <tk+ff@meskal.net>
> > ---
> > 
> >  .../files/etc/config/batman-adv                    | 15 ---------------
> >  .../files/etc/uci-defaults/93-fff-batman-adv       | 22
> >  ++++++++++++++++++++++ 2 files changed, 22 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/93-fff-bat
> >  man-adv> 
> > 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/93-fff-ba
> > tman-adv
> > b/src/packages/fff/fff-batman-adv-legacy/files/etc/uci-defaults/93-fff-ba
> > tman-adv new file mode 100644
> > index 0000000..9bc3928
> > --- /dev/null
> > +++
> > b/src/packages/fff/fff-batman-adv-legacy/files/etc/uci-defaults/93-fff-ba
> > tman-adv @@ -0,0 +1,22 @@
> > +#!/bin/sh
> > +
> > +uci batch <<EOF
> > +  delete batman-adv.bat0
> > +  set batman-adv.bat0=mesh
> > +  set batman-adv.bat0.gw_mode='client'
> > +  set batman-adv.bat0.gw_sel_class='1'
> > +  set batman-adv.bat0.bridge_loop_avoidance='0'
> > +  set batman-adv.bat0.network_coding='0'
> > +  set batman-adv.bat0.aggregated_ogms='1'
> > +  set batman-adv.bat0.ap_isolation='0'
> > +  set batman-adv.bat0.bonding='0'
> > +  set batman-adv.bat0.fragmentation='1'
> > +  set batman-adv.bat0.orig_interval='1000'
> > +  set batman-adv.bat0.vis_mode='0'
> > +  set batman-adv.bat0.distributed_arp_table='1'
> > +  set batman-adv.bat0.hop_penalty='30'
> > +EOF
> > +
> > +uci commit
> > +
> > +exit 0
Tim Niemeyer June 10, 2016, 9 p.m. 
Am Donnerstag, den 09.06.2016, 14:27 +0200 schrieb Tobias Klaus:
> Hallo Jan,
> 
> danke für deine Reviews.
> 
> Ich hab hier explizit die defaults gesetzt um eben den status quo auch zu 
> dokumentieren und um die defaults in "unseren" Hoheitsbereich zu verschieben.

Kann ich nachvollziehen. Daher von mir
Reviewed-by: Tim Niemeyer <tim@tn-x.org>

Tim

> 
> Wenn wir so etwas wie "network coding"[] aktivieren möchten, sollten wir das 
> explizit(und in unserem Repo sichtbar) machen und nicht durch ein batman-
> Update, das plötzlich andere Defaults verwendet.
> 
> Grüße
> Tobias
> 
> Am Donnerstag, 9. Juni 2016, 14:18:54 CEST schrieb mayosemmel:
> > Hallo Tobias,
> > 
> > Ist in Tims patch etwas schöner, weil die defaults nicht mehr explizit
> > gesetzt werden.
> > Ansonsten gäbe es auch einen review.
> > 
> > Grüße Jan
> > 
> > Am Mittwoch, den 08.06.2016, 10:24 +0200 schrieb Tobias Klaus:
> > > Signed-off-by: Tobias Klaus <tk+ff@meskal.net>
> > > ---
> > > 
> > >  .../files/etc/config/batman-adv                    | 15 ---------------
> > >  .../files/etc/uci-defaults/93-fff-batman-adv       | 22
> > >  ++++++++++++++++++++++ 2 files changed, 22 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/93-fff-bat
> > >  man-adv> 
> > > 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/93-fff-ba
> > > tman-adv
> > > b/src/packages/fff/fff-batman-adv-legacy/files/etc/uci-defaults/93-fff-ba
> > > tman-adv new file mode 100644
> > > index 0000000..9bc3928
> > > --- /dev/null
> > > +++
> > > b/src/packages/fff/fff-batman-adv-legacy/files/etc/uci-defaults/93-fff-ba
> > > tman-adv @@ -0,0 +1,22 @@
> > > +#!/bin/sh
> > > +
> > > +uci batch <<EOF
> > > +  delete batman-adv.bat0
> > > +  set batman-adv.bat0=mesh
> > > +  set batman-adv.bat0.gw_mode='client'
> > > +  set batman-adv.bat0.gw_sel_class='1'
> > > +  set batman-adv.bat0.bridge_loop_avoidance='0'
> > > +  set batman-adv.bat0.network_coding='0'
> > > +  set batman-adv.bat0.aggregated_ogms='1'
> > > +  set batman-adv.bat0.ap_isolation='0'
> > > +  set batman-adv.bat0.bonding='0'
> > > +  set batman-adv.bat0.fragmentation='1'
> > > +  set batman-adv.bat0.orig_interval='1000'
> > > +  set batman-adv.bat0.vis_mode='0'
> > > +  set batman-adv.bat0.distributed_arp_table='1'
> > > +  set batman-adv.bat0.hop_penalty='30'
> > > +EOF
> > > +
> > > +uci commit
> > > +
> > > +exit 0
> 
> -- 
> franken-dev mailing list
> franken-dev@freifunk.net
> http://lists.freifunk.net/mailman/listinfo/franken-dev-freifunk.net