forked from freifunk-franken/firmware
nodewatcher: Send babeld version
Signed-off-by: Fabian Bläse <fabian@blaese.de> Reviewed-by: Christian Dresel <fff@chrisi01.de> Reviewed-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
This commit is contained in:
parent
8edb1689a3
commit
cac9b55aa2
|
@ -1,7 +1,7 @@
|
||||||
include $(TOPDIR)/rules.mk
|
include $(TOPDIR)/rules.mk
|
||||||
|
|
||||||
PKG_NAME:=fff-nodewatcher
|
PKG_NAME:=fff-nodewatcher
|
||||||
PKG_RELEASE:=54
|
PKG_RELEASE:=55
|
||||||
|
|
||||||
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
|
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
|
||||||
|
|
||||||
|
|
|
@ -12,7 +12,7 @@ if ! lock -n "$lockfile"; then
|
||||||
fi
|
fi
|
||||||
trap "lock -u \"$lockfile\"" INT TERM EXIT
|
trap "lock -u \"$lockfile\"" INT TERM EXIT
|
||||||
|
|
||||||
SCRIPT_VERSION="54"
|
SCRIPT_VERSION="55"
|
||||||
|
|
||||||
#Get the configuration from the uci configuration file
|
#Get the configuration from the uci configuration file
|
||||||
#If it does not exists, then get it from a normal bash file with variables.
|
#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>"
|
fastd_version="<fastd_version>$(/usr/bin/fastd -v | awk '{ print $2 }')</fastd_version>"
|
||||||
fi
|
fi
|
||||||
nodewatcher_version=$SCRIPT_VERSION
|
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
|
if [ -f "$SCRIPT_STATUS_FILE" ]; then
|
||||||
status_text="<status_text>$(cat "$SCRIPT_STATUS_FILE")</status_text>"
|
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"<kernel_version>$kernel_version</kernel_version>"
|
||||||
SYSTEM_DATA=$SYSTEM_DATA"$fastd_version"
|
SYSTEM_DATA=$SYSTEM_DATA"$fastd_version"
|
||||||
SYSTEM_DATA=$SYSTEM_DATA"<nodewatcher_version>$nodewatcher_version</nodewatcher_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_version>$FIRMWARE_VERSION</firmware_version>"
|
||||||
SYSTEM_DATA=$SYSTEM_DATA"<firmware_revision>$BUILD_DATE</firmware_revision>"
|
SYSTEM_DATA=$SYSTEM_DATA"<firmware_revision>$BUILD_DATE</firmware_revision>"
|
||||||
SYSTEM_DATA=$SYSTEM_DATA"<openwrt_core_revision>$OPENWRT_CORE_REVISION</openwrt_core_revision>"
|
SYSTEM_DATA=$SYSTEM_DATA"<openwrt_core_revision>$OPENWRT_CORE_REVISION</openwrt_core_revision>"
|
||||||
|
|
Loading…
Reference in New Issue
Block a user