From 40f26d74a7026c5c7f972941a7e7c950b8dc7215 Mon Sep 17 00:00:00 2001
From: Adrian Schmutzler <freifunk@adrianschmutzler.de>
Date: Sun, 31 Jan 2021 13:27:09 +0100
Subject: [PATCH] fff-nodewatcher: consolidate uci-defaults scripts

The uci-defaults scripts are meant to provide defaults for a
specific package. Distributing them across several packages makes
no sense and just makes maintainance worse.

Thus, move the network part of the initialization back to the
proper package. While at it, suppress output from add commands.

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
Reviewed-by: Robert Langhammer <rlanghammer@web.de>
---
 src/packages/fff/fff-network/Makefile                    | 2 +-
 .../files/etc/uci-defaults/94-fff-nodewatcher-network    | 9 ---------
 .../files/etc/uci-defaults/93-fff-nodewatcher            | 6 +++++-
 3 files changed, 6 insertions(+), 11 deletions(-)
 delete mode 100644 src/packages/fff/fff-network/files/etc/uci-defaults/94-fff-nodewatcher-network

diff --git a/src/packages/fff/fff-network/Makefile b/src/packages/fff/fff-network/Makefile
index f11c4469..bb3eb677 100644
--- a/src/packages/fff/fff-network/Makefile
+++ b/src/packages/fff/fff-network/Makefile
@@ -1,7 +1,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=fff-network
-PKG_RELEASE:=36
+PKG_RELEASE:=37
 
 include $(INCLUDE_DIR)/package.mk
 
diff --git a/src/packages/fff/fff-network/files/etc/uci-defaults/94-fff-nodewatcher-network b/src/packages/fff/fff-network/files/etc/uci-defaults/94-fff-nodewatcher-network
deleted file mode 100644
index 1cdbd4b4..00000000
--- a/src/packages/fff/fff-network/files/etc/uci-defaults/94-fff-nodewatcher-network
+++ /dev/null
@@ -1,9 +0,0 @@
-uci batch <<EOF
-  add nodewatcher network
-  set nodewatcher.@network[-1].mesh_interface='br-client'
-  set nodewatcher.@network[-1].iface_blacklist='lo ifb0'
-  set nodewatcher.@network[-1].ip_whitelist='br-client'
-EOF
-uci commit nodewatcher
-
-exit 0
diff --git a/src/packages/fff/fff-nodewatcher/files/etc/uci-defaults/93-fff-nodewatcher b/src/packages/fff/fff-nodewatcher/files/etc/uci-defaults/93-fff-nodewatcher
index 5c2d4e3e..8b3a91f1 100644
--- a/src/packages/fff/fff-nodewatcher/files/etc/uci-defaults/93-fff-nodewatcher
+++ b/src/packages/fff/fff-nodewatcher/files/etc/uci-defaults/93-fff-nodewatcher
@@ -1,9 +1,13 @@
 touch /etc/config/nodewatcher
 
-uci batch <<EOF
+uci batch >/dev/null <<EOF
   add nodewatcher script
   set nodewatcher.@script[-1].data_file='/tmp/crawldata/node.data'
   set nodewatcher.@script[-1].status_text_file='/tmp/status.txt'
+  add nodewatcher network
+  set nodewatcher.@network[-1].mesh_interface='br-client'
+  set nodewatcher.@network[-1].iface_blacklist='lo ifb0'
+  set nodewatcher.@network[-1].ip_whitelist='br-client'
 EOF
 uci commit nodewatcher