| Message ID | 20190625130807.878-1-freifunk@adrianschmutzler.de |
|---|---|
| State | Superseded |
| Headers | show |
diff --git a/src/packages/fff/fff-support/Makefile b/src/packages/fff/fff-support/Makefile index 56e35740..2fc74b0c 100644 --- a/src/packages/fff/fff-support/Makefile +++ b/src/packages/fff/fff-support/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=fff-support -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) diff --git a/src/packages/fff/fff-support/files/usr/sbin/show_info b/src/packages/fff/fff-support/files/usr/sbin/show_info index d7ec8247..d3367aec 100755 --- a/src/packages/fff/fff-support/files/usr/sbin/show_info +++ b/src/packages/fff/fff-support/files/usr/sbin/show_info @@ -62,11 +62,7 @@ if pidof fastd >/dev/null ; then else vpn_active="inaktiv" fi -if grep -q '1' /sys/class/net/l2tp*/carrier 2> /dev/null ; then - l2tp_active="aktiv" -else - l2tp_active="inaktiv" -fi + up="$(uptime)" load="${up##*:}" uptime="${up%%,*}" @@ -101,7 +97,6 @@ echo "MAC-Adresse: $(cat /sys/class/net/br-mesh/address)" echo "Bekannte Knoten: $(($(batctl tg -H | cut -b 40-56 | sort | uniq | wc -l 2>/dev/null)+1))" echo "Nachbarknoten: $(batctl o -H | cut -b 40-56 | sort | uniq | wc -l 2>/dev/null)" echo "VPN via fastd: ${vpn_active}" -echo "VPN via L2TP: ${l2tp_active}" echo "Laufzeit: ${uptime}" echo "Auslastung: ${load}" echo "Uhrzeit: $(date)" @@ -145,21 +140,6 @@ else echo "No FASTD peers available" fi -function printL2TP() { - local broker="$1" - echo "${broker}: $(uci -q get "tunneldigger.$broker.address")" -} - -echo "" -if [ -s /etc/config/tunneldigger ]; then - echo "-> L2TP: Peer list" - config_load tunneldigger - config_foreach printL2TP broker -else - echo "-> L2TP" - echo "No L2TP peers available" -fi - echo "" echo "-> Netz: WAN" echo "Internet vorhanden: ${internet_active}"
Hi Adrian, da hab ich doch tatsächlich noch einen übersehen. Reviewed-by: Robert Langhammer <rlanghammer@web.de> Am 25.06.19 um 15:08 schrieb Adrian Schmutzler: > Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de> > --- > src/packages/fff/fff-support/Makefile | 2 +- > .../fff/fff-support/files/usr/sbin/show_info | 22 +------------------ > 2 files changed, 2 insertions(+), 22 deletions(-) > > diff --git a/src/packages/fff/fff-support/Makefile b/src/packages/fff/fff-support/Makefile > index 56e35740..2fc74b0c 100644 > --- a/src/packages/fff/fff-support/Makefile > +++ b/src/packages/fff/fff-support/Makefile > @@ -1,7 +1,7 @@ > include $(TOPDIR)/rules.mk > > PKG_NAME:=fff-support > -PKG_RELEASE:=2 > +PKG_RELEASE:=3 > > PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) > > diff --git a/src/packages/fff/fff-support/files/usr/sbin/show_info b/src/packages/fff/fff-support/files/usr/sbin/show_info > index d7ec8247..d3367aec 100755 > --- a/src/packages/fff/fff-support/files/usr/sbin/show_info > +++ b/src/packages/fff/fff-support/files/usr/sbin/show_info > @@ -62,11 +62,7 @@ if pidof fastd >/dev/null ; then > else > vpn_active="inaktiv" > fi > -if grep -q '1' /sys/class/net/l2tp*/carrier 2> /dev/null ; then > - l2tp_active="aktiv" > -else > - l2tp_active="inaktiv" > -fi > + > up="$(uptime)" > load="${up##*:}" > uptime="${up%%,*}" > @@ -101,7 +97,6 @@ echo "MAC-Adresse: $(cat /sys/class/net/br-mesh/address)" > echo "Bekannte Knoten: $(($(batctl tg -H | cut -b 40-56 | sort | uniq | wc -l 2>/dev/null)+1))" > echo "Nachbarknoten: $(batctl o -H | cut -b 40-56 | sort | uniq | wc -l 2>/dev/null)" > echo "VPN via fastd: ${vpn_active}" > -echo "VPN via L2TP: ${l2tp_active}" > echo "Laufzeit: ${uptime}" > echo "Auslastung: ${load}" > echo "Uhrzeit: $(date)" > @@ -145,21 +140,6 @@ else > echo "No FASTD peers available" > fi > > -function printL2TP() { > - local broker="$1" > - echo "${broker}: $(uci -q get "tunneldigger.$broker.address")" > -} > - > -echo "" > -if [ -s /etc/config/tunneldigger ]; then > - echo "-> L2TP: Peer list" > - config_load tunneldigger > - config_foreach printL2TP broker > -else > - echo "-> L2TP" > - echo "No L2TP peers available" > -fi > - > echo "" > echo "-> Netz: WAN" > echo "Internet vorhanden: ${internet_active}"
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de> --- src/packages/fff/fff-support/Makefile | 2 +- .../fff/fff-support/files/usr/sbin/show_info | 22 +------------------ 2 files changed, 2 insertions(+), 22 deletions(-)