[PATCH] Revert "Added an automatism which will retrive Router-Coordinates from the old Netmon system"

[Tim Niemeyer]

Jo, absolut.

Reviewed-by: Tim Niemeyer <tim at tn-x.org>

Tim

Am 11. März 2017 11:59:14 MEZ schrieb Jan Kraus <mayosemmel at googlemail.com>:
>This reverts commit d6f2f18e4980074e16910cffd92e6ac5e08a69ff.
>The Netmon is gone, so this workaround is not needed any longer.
>
>Signed-off-by: Jan Kraus <mayosemmel at gmail.com>
>---
> src/packages/fff/fff-sysupgrade/Makefile           |  2 +-
> .../files/usr/lib/micron.d/fff-sysupgrade          |  1 -
>.../files/usr/sbin/copy_netmon_coordinates.sh      | 69
>----------------------
> 3 files changed, 1 insertion(+), 71 deletions(-)
>delete mode 100644
>src/packages/fff/fff-sysupgrade/files/usr/lib/micron.d/fff-sysupgrade
>delete mode 100755
>src/packages/fff/fff-sysupgrade/files/usr/sbin/copy_netmon_coordinates.sh
>
>diff --git a/src/packages/fff/fff-sysupgrade/Makefile
>b/src/packages/fff/fff-sysupgrade/Makefile
>index d671e0c..f6fb2cf 100644
>--- a/src/packages/fff/fff-sysupgrade/Makefile
>+++ b/src/packages/fff/fff-sysupgrade/Makefile
>@@ -1,7 +1,7 @@
> include $(TOPDIR)/rules.mk
> 
> PKG_NAME:=fff-sysupgrade
>-PKG_VERSION:=0.0.3
>+PKG_VERSION:=0.0.4
> PKG_RELEASE:=4
> 
> PKG_BUILD_DIR:=$(BUILD_DIR)/fff-sysupgrade
>diff --git
>a/src/packages/fff/fff-sysupgrade/files/usr/lib/micron.d/fff-sysupgrade
>b/src/packages/fff/fff-sysupgrade/files/usr/lib/micron.d/fff-sysupgrade
>deleted file mode 100644
>index 312972f..0000000
>---
>a/src/packages/fff/fff-sysupgrade/files/usr/lib/micron.d/fff-sysupgrade
>+++ /dev/null
>@@ -1 +0,0 @@
>-*/5 * * * * /usr/sbin/copy_netmon_coordinates.sh
>\ No newline at end of file
>diff --git
>a/src/packages/fff/fff-sysupgrade/files/usr/sbin/copy_netmon_coordinates.sh
>b/src/packages/fff/fff-sysupgrade/files/usr/sbin/copy_netmon_coordinates.sh
>deleted file mode 100755
>index 1d042e4..0000000
>---
>a/src/packages/fff/fff-sysupgrade/files/usr/sbin/copy_netmon_coordinates.sh
>+++ /dev/null
>@@ -1,69 +0,0 @@
>-#!/bin/sh
>-
>-delete_myself()
>-{
>-	echo "This Script will be deleted now!"
>-	rm -f /usr/lib/micron.d/fff-sysupgrade
>-	rm -f "$0"
>-	exit 0
>-}
>-
>-#Get Mac Address of br-mesh if already up
>-if ! mac=$( cat /sys/class/net/br-mesh/address ); then
>-	echo "Interface br-mesh is not available!"
>-	exit 1
>-fi
>-
>-#Check if Coordinates are already set
>-if uci get system. at system[0].latitude && uci get
>system. at system[0].longitude; then
>-	echo "Coordinates are already set."
>-	delete_myself
>-fi
>-
>-#Get Router from Netmon Database
>-xml_data=$( wget -q -O -
>"http://fe80::ff:feee:1%br-mesh/api/rest/api.php?rquest=router&mac=${mac//:}"
>2>&1)
>-
>-if [ -z "$xml_data" ]; then
>-	echo "xml_data is not set"
>-	exit 1
>-elif echo "$xml_data"|grep "can't connect to remote host" ;then
>-	echo "The Netmon Server can't be reached."
>-	exit 1
>-elif echo "$xml_data"|grep "HTTP/1.1 404 Not Found" ;then
>-	echo "This Router is not present in the Netmon Database."
>-	delete_myself
>-fi
>-
>-#Reduce XML_DATA to Router only
>-xml_data=$( echo $xml_data |grep -o '<router>.*<\/router>' |sed -e
>'s/<user>.*<\/user>//g' |sed -e 's/<chipset>.*<\/chipset>//g' |sed -e
>'s/<chipset>.*<\/chipset>//g' )
>-
>-#Get needed Variables
>-hostname=$( echo $xml_data |grep -o  '<hostname>.*<\/hostname>'|sed -e
>'s/<\/\?hostname>//g' )
>-description=$( echo $xml_data |grep -o 
>'<description>.*<\/description>'|sed -e 's/<\/\?description>//g' )
>-latitude=$( echo $xml_data |grep -o  '<latitude>.*<\/latitude>'|sed -e
>'s/<\/\?latitude>//g' )
>-longitude=$( echo $xml_data |grep -o  '<longitude>.*<\/longitude>'|sed
>-e 's/<\/\?longitude>//g' )
>-
>-#Check for netmon default coordinates
>-if [ "$latitude" -eq 0 ] && [ "$longitude" -eq 0 ]; then
>-	echo "Unable to retrieve coordinates from Netmon."
>-	echo "Maybe the coordinates are suppressed."
>-	delete_myself
>-elif [ -z "$latitude" ] || [ -z "$longitude" ]; then
>-    echo "No coordinates, looks like an error"
>-    exit 1
>-fi
>-
>-uci set system. at system[0]=system
>-echo "Setting hostname $hostname"
>-uci set system. at system[0].hostname="$hostname"
>-echo "Setting description $description"
>-uci set system. at system[0].description="$description"
>-echo "Setting latitude $latitude"
>-uci set system. at system[0].latitude="$latitude"
>-echo "Setting longitude $longitude"
>-uci set system. at system[0].longitude="$longitude"
>-uci commit
>-
>-echo "Coordinates are now copied from Netmon. Router will be
>rebooted."
>-reboot
>-exit 0
>\ No newline at end of file