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

@@ -1,7 +1,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=fff-network
-PKG_RELEASE:=36
+PKG_RELEASE:=37
 
 include $(INCLUDE_DIR)/package.mk
 

src/packages/fff/fff-network/files/etc/uci-defaults/94-fff-nodewatcher-network

@@ -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

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