[SQUASHED PATCH v17 6/8] Remove references to community.cfg

Tim Niemeyer tim at tn-x.org
Sa Okt 14 19:39:11 CEST 2017


Hi

Am Samstag, den 14.10.2017, 19:19 +0200 schrieb Tim Niemeyer:
> > From: Adrian Schmutzler <freifunk at adrianschmutzler.de>
> 
> This removes all references to community.cfg except in the
> buildscript and except the file itself.
> 
> > Signed-off-by: Adrian Schmutzler <freifunk at adrianschmutzler.de>
> > Tested-by: Adrian Schmutzler <freifunk at adrianschmutzler.de>
> > Signed-off-by: Tim Niemeyer <tim at tn-x.org>
> ---
> 
> Changes in v17: None
> Changes in v16: None
> Changes in v15: None
> Changes in v14:
> - Removed interface ID for timeserver
> 
> Changes in v13:
> - Fixed timeserver and upgrade path to be set by keyxchange
> 
> Changes in v12: None
> Changes in v11: None
> Changes in v10: None
> Changes in v9: None
> Changes in v8: None
> Changes in v7: None
> Changes in v6: None
> Changes in v5: None
> Changes in v4: None
> Changes in v3: None
> Changes in v2: None
> 
>  .../fff-fastd/files/etc/uci-defaults/55_fff-fastd  | 41 +++++++++++-----------
>  .../fff-hoods/files/lib/functions/fff/keyxchange   | 15 ++++++++
>  .../fff/fff-hoods/files/usr/sbin/configurehood     |  6 ++++
>  .../fff/fff-support/files/usr/sbin/show_info       |  1 -
>  src/packages/fff/fff-sysupgrade/Makefile           |  4 +--
>  .../fff/fff-sysupgrade/files/etc/sysupgrade.sh     |  9 ++++-
>  src/packages/fff/fff-timeserver/Makefile           |  2 +-
>  .../files/etc/uci-defaults/51-fff-timeserver       |  3 +-
>  8 files changed, 53 insertions(+), 28 deletions(-)
>  create mode 100644 src/packages/fff/fff-hoods/files/lib/functions/fff/keyxchange
>  mode change 100755 => 100644 src/packages/fff/fff-timeserver/files/etc/uci-defaults/51-fff-timeserver

[..]
> new file mode 100644
> index 0000000..ddae6b3
> --- /dev/null
> +++ b/src/packages/fff/fff-hoods/files/lib/functions/fff/keyxchange
> @@ -0,0 +1,15 @@
> +#!/bin/sh
> +# Copyright 2017 Adrian Schmutzler
> +# License GPLv3

Hier muss noch die folgende Zeile ergänzt werden:
. /usr/share/libubox/jshn.sh

Tim

> +
> +getUpgradePath() {
> > +	if [ -s /tmp/keyxchangev2data ]; then
> > +		json_load "$(cat /tmp/keyxchangev2data)"
> > +		json_select hood
> > +		json_get_var upath upgrade_path
> > +		echo "$upath"
> > +	else
> > +		return 1
> > +	fi
> > +	return 0
> +}

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


Mehr Informationen über die Mailingliste franken-dev