From 07a066152b8072de80be55ae13806c879e0e571d Mon Sep 17 00:00:00 2001
From: FFS-Roland <ffs-monitor@gmx.de>
Date: Tue, 20 Jun 2017 10:18:00 +0200
Subject: [PATCH] modified condition to detect not running fastd.
---
ffs-set-segment/files/usr/sbin/ffs-set-segment | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/ffs-set-segment/files/usr/sbin/ffs-set-segment b/ffs-set-segment/files/usr/sbin/ffs-set-segment
index 6f961dd..2f1ea56 100755
--- a/ffs-set-segment/files/usr/sbin/ffs-set-segment
+++ b/ffs-set-segment/files/usr/sbin/ffs-set-segment
@@ -4,7 +4,7 @@ if [ $(ps | grep -c "$ME") -gt 4 ]; then
logger -s -t $ME "started twice"
exit 1
fi
-if [ $(ps | grep -c "fastd") -lt 2 ]; then
+if [ ! -d "/proc/$(cat /var/run/fastd.mesh_vpn.pid)" ]; then
logger -t $ME "fastd not running"
exit 0
fi
@@ -17,7 +17,7 @@ NODEID=$(uci get network.bat0.macaddr | sed 's/://g')
PUBKEY=$(/etc/init.d/fastd show_key mesh_vpn | cut -c1-12)
SEGINFO=$(nslookup ffs-${NODEID}-${PUBKEY}.segassign.freifunk-stuttgart.de [::1]:54 | grep "2001:2:0:711::")
if [ -z "$SEGINFO" ]; then
- logger -t $ME "Node not known"
+ logger -t $ME "Node not registered"
exit 1
fi
SEGINFO=${SEGINFO/Address 1: 2001:2:0:711::/}
--
GitLab