From 5a119dcda8cc0c4dec4ee7a41f9a6a629fb272a4 Mon Sep 17 00:00:00 2001
From: Robert Langhammer <rlanghammer@web.de>
Date: Thu, 27 Jun 2019 14:44:27 +0200
Subject: [PATCH] fff-nodewatcher: remove l2tp
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Robert Langhammer <rlanghammer@web.de>
Reviewed-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
[Bump PKG_RELEASE and SCRIPT_VERSION]
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
Reviewed-by: Fabian Bläse <fabian@blaese.de>
---
src/packages/fff/fff-nodewatcher/Makefile | 2 +-
src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher | 6 +++---
2 files changed, 4 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..90509ba1 100755
--- a/src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher
+++ b/src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher
@@ -12,7 +12,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.
@@ -114,8 +114,8 @@ crawl() {
status_text="<status_text>$(cat "$SCRIPT_STATUS_FILE")</status_text>"
fi
- #Checks whether either fastd or L2TP is connected
- if pidof fastd >/dev/null || grep -q '1' /sys/class/net/l2tp*/carrier 2> /dev/null ; then
+ # Checks if fastd is running
+ if pidof fastd >/dev/null ; then
vpn_active="<vpn_active>1</vpn_active>"
else
vpn_active="<vpn_active>0</vpn_active>"
--
GitLab