[PATCH] fff-hoods/fff-web: create link to hood file in fff-hoods

[mail at adrianschmutzler.de]

Merged.

> -----Original Message-----
> From: franken-dev [mailto:franken-dev-bounces at freifunk.net] On Behalf
> Of Adrian Schmutzler
> Sent: Samstag, 25. April 2020 23:28
> To: franken-dev at freifunk.net
> Subject: [PATCH] fff-hoods/fff-web: create link to hood file in fff-hoods
> 
> For the layer-3 firmware, we currently do not support a hood file for
> automatically creating a mesh. However, the link for the hood file is still
> created in fff-web.
> 
> Move this setup to fff-hoods, which is specific to the node firmware.
> 
> Signed-off-by: Adrian Schmutzler <freifunk at adrianschmutzler.de>
> ---
>  src/packages/fff/fff-hoods/Makefile                          | 2 +-
>  .../fff/fff-hoods/files/etc/uci-defaults/93-fff-hoodfile     | 5 +++++
>  src/packages/fff/fff-web/Makefile                            | 2 +-
>  .../fff/fff-web/files/etc/uci-defaults/93-fff-uhttpd         | 4 ----
>  4 files changed, 7 insertions(+), 6 deletions(-)  create mode 100644
> src/packages/fff/fff-hoods/files/etc/uci-defaults/93-fff-hoodfile
> 
> diff --git a/src/packages/fff/fff-hoods/Makefile b/src/packages/fff/fff-
> hoods/Makefile
> index e5680c22..f2cca3d0 100644
> --- a/src/packages/fff/fff-hoods/Makefile
> +++ b/src/packages/fff/fff-hoods/Makefile
> @@ -1,7 +1,7 @@
>  include $(TOPDIR)/rules.mk
> 
>  PKG_NAME:=fff-hoods
> -PKG_RELEASE:=9
> +PKG_RELEASE:=10
> 
>  PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
> 
> diff --git a/src/packages/fff/fff-hoods/files/etc/uci-defaults/93-fff-hoodfile
> b/src/packages/fff/fff-hoods/files/etc/uci-defaults/93-fff-hoodfile
> new file mode 100644
> index 00000000..a52646fa
> --- /dev/null
> +++ b/src/packages/fff/fff-hoods/files/etc/uci-defaults/93-fff-hoodfile
> @@ -0,0 +1,5 @@
> +. /lib/functions/fff/keyxchange
> +
> +ln -s "$hoodfilewww" /www/hood/keyxchangev2data
> +
> +exit 0
> diff --git a/src/packages/fff/fff-web/Makefile b/src/packages/fff/fff-
> web/Makefile
> index 3f16fded..c0783b7b 100644
> --- a/src/packages/fff/fff-web/Makefile
> +++ b/src/packages/fff/fff-web/Makefile
> @@ -1,7 +1,7 @@
>  include $(TOPDIR)/rules.mk
> 
>  PKG_NAME:=fff-web
> -PKG_RELEASE:=10
> +PKG_RELEASE:=11
> 
>  PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
> 
> diff --git a/src/packages/fff/fff-web/files/etc/uci-defaults/93-fff-uhttpd
> b/src/packages/fff/fff-web/files/etc/uci-defaults/93-fff-uhttpd
> index f3135370..fc26581b 100644
> --- a/src/packages/fff/fff-web/files/etc/uci-defaults/93-fff-uhttpd
> +++ b/src/packages/fff/fff-web/files/etc/uci-defaults/93-fff-uhttpd
> @@ -1,7 +1,3 @@
> -. /lib/functions/fff/keyxchange
> -
> -ln -s "$hoodfilewww" /www/hood/keyxchangev2data
> -
>  uci batch <<EOF
>    delete uhttpd.main
>    delete uhttpd.public
> --
> 2.20.1
-------------- nächster Teil --------------
Ein Dateianhang mit Binärdaten wurde abgetrennt...
Dateiname   : openpgp-digital-signature.asc
Dateityp    : application/pgp-signature
Dateigröße  : 834 bytes
Beschreibung: nicht verfügbar
URL         : <https://lists.freifunk.net/pipermail/franken-dev-freifunk.net/attachments/20200618/f931f77f/attachment.sig>