From patchwork Tue Apr 23 11:00:54 2019
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: [2/3] fff-nodewatcher: Make nodewatcher independent from /tmp/started
From: Adrian Schmutzler <freifunk@adrianschmutzler.de>
X-Patchwork-Id: 1093
Message-Id: <20190423110055.4673-2-freifunk@adrianschmutzler.de>
To: franken-dev@freifunk.net
Date: Tue, 23 Apr 2019 13:00:54 +0200

From: Robert Langhammer <rlanghammer@web.de>

Since configurehood starts alfred at START=35 if a hood file is
obtained, nodewatcher will not need to check.
If configurehood failed, nodewatcher will fail, too. But there
will be no destination to send to anyway.

Signed-off-by: Robert Langhammer <rlanghammer@web.de>
[Undo change in micrond, bump PKG_RELEASE]
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
---
 src/packages/fff/fff-nodewatcher/Makefile                   | 2 +-
 src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/packages/fff/fff-nodewatcher/Makefile b/src/packages/fff/fff-nodewatcher/Makefile
index f6bdbb52..a5551e04 100644
--- a/src/packages/fff/fff-nodewatcher/Makefile
+++ b/src/packages/fff/fff-nodewatcher/Makefile
@@ -1,7 +1,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=fff-nodewatcher
-PKG_RELEASE:=52
+PKG_RELEASE:=53
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
 
diff --git a/src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher b/src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher
index 5e75f032..6084c94b 100755
--- a/src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher
+++ b/src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher
@@ -2,8 +2,6 @@
 # Netmon Nodewatcher (C) 2010-2012 Freifunk Oldenburg
 # License; GPL v3
 
-test -f /tmp/started || exit
-
 # Allow only one instance
 lockfile="/var/lock/${0##*/}.lock"
 if ! lock -n "$lockfile"; then
@@ -12,7 +10,7 @@ if ! lock -n "$lockfile"; then
 fi
 trap "lock -u \"$lockfile\"" INT TERM EXIT
 
-SCRIPT_VERSION="52"
+SCRIPT_VERSION="53"
 
 #Get the configuration from the uci configuration file
 #If it does not exists, then get it from a normal bash file with variables.