| Message ID | 20190625123336.21719-3-rlanghammer@web.de |
|---|---|
| State | Superseded |
| Headers | show |
diff --git a/src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher b/src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher index 5e75f03..d6c383d 100755 --- a/src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher +++ b/src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher @@ -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>"
Reviewed-by: Adrian Schmutzler <freifunk@adrianschmutzler.de> Bitte Version noch anpassen (zweimal!): src/packages/fff/fff-nodewatcher/Makefile: - PKG_RELEASE:=52 + PKG_RELEASE:=53 src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher: - SCRIPT_VERSION="52" + SCRIPT_VERSION="53" Grüße Adrian > -----Original Message----- > From: franken-dev [mailto:franken-dev-bounces@freifunk.net] On Behalf Of > Robert Langhammer > Sent: Dienstag, 25. Juni 2019 14:34 > To: franken-dev@freifunk.net > Subject: [PATCH 2/4] fff-nodewatcher: remove l2tp > > Signed-off-by: Robert Langhammer <rlanghammer@web.de> > --- > src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher > b/src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher > index 5e75f03..d6c383d 100755 > --- a/src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher > +++ b/src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher > @@ -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>" > -- > 2.20.1
Signed-off-by: Robert Langhammer <rlanghammer@web.de> --- src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.20.1