From c33952656c2925cc28a7ce43c204a10298a32d53 Mon Sep 17 00:00:00 2001 From: Tim Niemeyer Date: Sat, 11 Jun 2016 17:20:50 +0200 Subject: [PATCH] fff-nodewatcher: fastd version only if installed Signed-off-by: Tim Niemeyer Reviewed-by: Jan Kraus Reviewed-by: Tobias Klaus --- src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher b/src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher index 8ea621c..e5d2fce 100755 --- a/src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher +++ b/src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher @@ -94,7 +94,9 @@ crawl() { batman_adv_version=$(cat /sys/module/batman_adv/version) kernel_version=$(uname -r) - fastd_version=$(fastd -v | awk '{ print $2 }') + if [ -x /usr/bin/fastd ]; then + fastd_version="$(/usr/bin/fastd -v | awk '{ print $2 }')" + fi nodewatcher_version=$SCRIPT_VERSION if [ -f "$SCRIPT_STATUS_FILE" ]; then @@ -136,7 +138,7 @@ crawl() { SYSTEM_DATA=$SYSTEM_DATA"$local_time" SYSTEM_DATA=$SYSTEM_DATA"$batman_adv_version" SYSTEM_DATA=$SYSTEM_DATA"$kernel_version" - SYSTEM_DATA=$SYSTEM_DATA"$fastd_version" + SYSTEM_DATA=$SYSTEM_DATA"$fastd_version" SYSTEM_DATA=$SYSTEM_DATA"$nodewatcher_version" SYSTEM_DATA=$SYSTEM_DATA"$FIRMWARE_VERSION" SYSTEM_DATA=$SYSTEM_DATA"$FIRMWARE_COMMUNITY"