From 83b70b83324e65c130dcf058652cc2be526694b7 Mon Sep 17 00:00:00 2001
From: Christian Dresel <freifunk@dresel.systems>
Date: Fri, 29 Jan 2021 09:03:01 +0100
Subject: [PATCH] treewide: Move fastd information for nodewatcher in the
 correct package

Fastd information should read from nodewatcher from the fastd package

With this patch it's possible to add wireguard information for layer3 in the correct package

Signed-off-by: Christian Dresel <freifunk@dresel.systems>
---
 .../fff/fff-fastd/files/usr/lib/nodewatcher.d/15-fastd.sh | 8 ++++++++
 .../files/usr/lib/nodewatcher.d/10-systemdata.sh          | 5 -----
 2 files changed, 8 insertions(+), 5 deletions(-)
 create mode 100755 src/packages/fff/fff-fastd/files/usr/lib/nodewatcher.d/15-fastd.sh

diff --git a/src/packages/fff/fff-fastd/files/usr/lib/nodewatcher.d/15-fastd.sh b/src/packages/fff/fff-fastd/files/usr/lib/nodewatcher.d/15-fastd.sh
new file mode 100755
index 00000000..c09629f8
--- /dev/null
+++ b/src/packages/fff/fff-fastd/files/usr/lib/nodewatcher.d/15-fastd.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+# Netmon Nodewatcher (C) 2010-2012 Freifunk Oldenburg
+# License; GPL v3
+
+# Checks if fastd is running
+vpn_active=0
+pidof fastd >/dev/null && vpn_active=1
+SYSTEM_DATA="$SYSTEM_DATA<vpn_active>$vpn_active</vpn_active>"
diff --git a/src/packages/fff/fff-nodewatcher/files/usr/lib/nodewatcher.d/10-systemdata.sh b/src/packages/fff/fff-nodewatcher/files/usr/lib/nodewatcher.d/10-systemdata.sh
index c5e07e1d..96f10575 100755
--- a/src/packages/fff/fff-nodewatcher/files/usr/lib/nodewatcher.d/10-systemdata.sh
+++ b/src/packages/fff/fff-nodewatcher/files/usr/lib/nodewatcher.d/10-systemdata.sh
@@ -107,11 +107,6 @@ if [ -s "$SCRIPT_STATUS_FILE" ]; then
 	SYSTEM_DATA="$SYSTEM_DATA<status_text>$(cat "$SCRIPT_STATUS_FILE")</status_text>"
 fi
 
-# Checks if fastd is running
-vpn_active=0
-pidof fastd >/dev/null && vpn_active=1
-SYSTEM_DATA="$SYSTEM_DATA<vpn_active>$vpn_active</vpn_active>"
-
 echo -n "<system_data>$SYSTEM_DATA</system_data>"
 
 exit 0