diff --git a/src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher b/src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher
index 3e7e836..8209f13 100755
--- a/src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher
+++ b/src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher
@@ -55,8 +55,17 @@ inArray() {
#and provided by a small local httpd
crawl() {
#Get system data from other locations
- err "`date`: Collecting basic system status data"
- hostname="$(cat /proc/sys/kernel/hostname)"
+ err "`date`: Collecting basic system status data"
+ hostname="$(cat /proc/sys/kernel/hostname)"
+ latitude="$(uci get system.@system[0].latitude)"
+ longitude="$(uci get system.@system[0].longitude)"
+ if [ -n "$longitude" -a -n "$latitude" ]; then
+ geo="$latitude$longitude";
+ fi
+ contact="$(uci get system.@system[0].contact)"
+ if [ -n "$contact" ]; then
+ contact="$contact"
+ fi
uptime=$(awk '{ printf ""$1""$2"" }' /proc/uptime)
memory=$(awk '
@@ -101,7 +110,7 @@ crawl() {
#OPENWRT_CORE_REVISION="35298"
#OPENWRT_FEEDS_PACKAGES_REVISION="35298"
. /etc/firmware_release
- SYSTEM_DATA="online$status_text$hostname$distname$distversion$cpu$model$memory$load$uptime$local_time$batman_adv_version$kernel_version$fastd_version$nodewatcher_version$FIRMWARE_VERSION$FIRMWARE_COMMUNITY$BUILD_DATE$OPENWRT_CORE_REVISION$OPENWRT_FEEDS_PACKAGES_REVISION"
+ SYSTEM_DATA="online$status_text$hostname${geo}${contact}$distname$distversion$cpu$model$memory$load$uptime$local_time$batman_adv_version$kernel_version$fastd_version$nodewatcher_version$FIRMWARE_VERSION$FIRMWARE_COMMUNITY$BUILD_DATE$OPENWRT_CORE_REVISION$OPENWRT_FEEDS_PACKAGES_REVISION"
err "`date`: Collecting information from network interfaces"