From patchwork Sat Jan 7 13:52:23 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [v2] Fixed unwanted reboot every 5 Minutes after -n flash From: Jan Kraus X-Patchwork-Id: 272 Message-Id: <1483797143-21634-1-git-send-email-mayosemmel@gmail.com> To: franken-dev@freifunk.net Cc: Jan Kraus Date: Sat, 7 Jan 2017 14:52:23 +0100 The error only occurs if there isn't any network connection. Fixes #23 Also added prevention for applying empty coordinates. Signed-off-by: Jan Kraus Reviewed-by: Tobias Klaus Reviewed-by: Tim Niemeyer --- changes in v2: fixed typo in error message (cannot to can't) added prevention for applying empty coordinates (thanks Tim) updated commit message for Mantis compatibility --- .../fff/fff-sysupgrade/files/usr/sbin/copy_netmon_coordinates.sh | 6 ++++++ 1 file changed, 6 insertions(+) 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 index 4c20974..1d042e4 100755 --- 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 @@ -26,6 +26,9 @@ xml_data=$( wget -q -O - "http://fe80::ff:feee:1%br-mesh/api/rest/api.php?rquest 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 @@ -45,6 +48,9 @@ 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.@system[0]=system