diff --git a/src/packages/fff/fff-nodewatcher/Makefile b/src/packages/fff/fff-nodewatcher/Makefile index be5f267a52481604fab642a29e124f2bed6f7309..0ed6684d96da6adc11d964a6dafd71ed187f6316 100644 --- a/src/packages/fff/fff-nodewatcher/Makefile +++ b/src/packages/fff/fff-nodewatcher/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=fff-nodewatcher -PKG_RELEASE:=54 +PKG_RELEASE:=55 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) diff --git a/src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher b/src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher index 09f6843df5bee170bdcc1fe25ee44aa172a937fd..ac815130fbf17f690eade4a1879f159389e65f69 100755 --- a/src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher +++ b/src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher @@ -12,7 +12,7 @@ if ! lock -n "$lockfile"; then fi trap "lock -u \"$lockfile\"" INT TERM EXIT -SCRIPT_VERSION="54" +SCRIPT_VERSION="55" #Get the configuration from the uci configuration file #If it does not exists, then get it from a normal bash file with variables. @@ -109,6 +109,9 @@ crawl() { fastd_version="<fastd_version>$(/usr/bin/fastd -v | awk '{ print $2 }')</fastd_version>" fi nodewatcher_version=$SCRIPT_VERSION + if [ -x /usr/sbin/babeld ]; then + babel_version="<babel_version>$(/usr/sbin/babeld -V 2>&1)</babel_version>" + fi if [ -f "$SCRIPT_STATUS_FILE" ]; then status_text="<status_text>$(cat "$SCRIPT_STATUS_FILE")</status_text>" @@ -160,6 +163,7 @@ crawl() { SYSTEM_DATA=$SYSTEM_DATA"<kernel_version>$kernel_version</kernel_version>" SYSTEM_DATA=$SYSTEM_DATA"$fastd_version" SYSTEM_DATA=$SYSTEM_DATA"<nodewatcher_version>$nodewatcher_version</nodewatcher_version>" + SYSTEM_DATA=$SYSTEM_DATA"$babel_version" SYSTEM_DATA=$SYSTEM_DATA"<firmware_version>$FIRMWARE_VERSION</firmware_version>" SYSTEM_DATA=$SYSTEM_DATA"<firmware_revision>$BUILD_DATE</firmware_revision>" SYSTEM_DATA=$SYSTEM_DATA"<openwrt_core_revision>$OPENWRT_CORE_REVISION</openwrt_core_revision>"