From f2b606200525772f85dc8864c5bc70ef36a51bdf Mon Sep 17 00:00:00 2001 From: floh1111 Date: Sat, 27 Aug 2011 19:16:09 +0000 Subject: [PATCH] Bugfixes --- root_file_system/default/etc/configurator.sh | 6 ++---- root_file_system/default/etc/nodewatcher.sh | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/root_file_system/default/etc/configurator.sh b/root_file_system/default/etc/configurator.sh index 1ab3008..01d5138 100644 --- a/root_file_system/default/etc/configurator.sh +++ b/root_file_system/default/etc/configurator.sh @@ -2,8 +2,6 @@ # Netmon Configurator (C) 2010-2011 Freifunk Oldenburg # Lizenz: GPL - - SCRIPT_DIR=`dirname $0` if [ -f /etc/config/configurator ];then @@ -133,7 +131,7 @@ assign_router() { autoadd_ipv6_address() { echo "`date`: Führe IPv6 Address autoadd durch" >> $SCRIPT_LOGFILE ipv6_link_local_addr="`ifconfig br-mesh | grep 'inet6 addr:' | grep 'Scope:Link' | awk '{ print $3}'`" - command="wget -q -O - http://$netmon_api/api_csv_configurator.php?section=autoadd_ipv6_address&&authentificationmethod=$CRAWL_METHOD&nickname=$CRAWL_NICKNAME&password=$CRAWL_PASSWORD&router_auto_update_hash=$CRAWL_UPDATE_HASH&router_id=$CRAWL_ROUTER_ID&ip=$ipv6_link_local_addr" + command="wget -q -O - http://$netmon_api/api_csv_configurator.php?section=autoadd_ipv6_address&authentificationmethod=$CRAWL_METHOD&nickname=$CRAWL_NICKNAME&password=$CRAWL_PASSWORD&router_auto_update_hash=$CRAWL_UPDATE_HASH&router_id=$CRAWL_ROUTER_ID&ip=$ipv6_link_local_addr" ergebnis=`$command&sleep $API_TIMEOUT; kill $!` if [ `echo $ergebnis| cut '-d,' -f1` = "success" ]; then uci set configurator.@netmon[0].autoadd_ipv6_address='0' @@ -179,4 +177,4 @@ if [[ $tmp = "sync_hostname" ]]; then if [[ $SCRIPT_SYNC_HOSTNAME = "1" ]]; then sync_hostname fi -fi \ No newline at end of file +fi diff --git a/root_file_system/default/etc/nodewatcher.sh b/root_file_system/default/etc/nodewatcher.sh index 095b490..db193c6 100755 --- a/root_file_system/default/etc/nodewatcher.sh +++ b/root_file_system/default/etc/nodewatcher.sh @@ -281,7 +281,7 @@ crawl() { link_quality="${link_quality//)/}" batman_adv_originators=$batman_adv_originators"$originator$link_quality$last_seen" - count=$[$count+1] + count=`expr $count + 1` done IFS=$OLDIFS fi