| Message ID | 1463229144-29414-5-git-send-email-tim@tn-x.org |
|---|---|
| State | Superseded, archived |
| Headers | show |
diff --git a/src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher b/src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher index cb568f4..8554ae9 100755 --- a/src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher +++ b/src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher @@ -95,7 +95,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="<fastd_version>$(/usr/bin/fastd -v | awk '{ print $2 }')</fastd_version>" + fi nodewatcher_version=$SCRIPT_VERSION if [ -f "$SCRIPT_STATUS_FILE" ]; then @@ -137,7 +139,7 @@ crawl() { SYSTEM_DATA=$SYSTEM_DATA"<local_time>$local_time</local_time>" SYSTEM_DATA=$SYSTEM_DATA"<batman_advanced_version>$batman_adv_version</batman_advanced_version>" SYSTEM_DATA=$SYSTEM_DATA"<kernel_version>$kernel_version</kernel_version>" - SYSTEM_DATA=$SYSTEM_DATA"<fastd_version>$fastd_version</fastd_version>" + SYSTEM_DATA=$SYSTEM_DATA"$fastd_version" SYSTEM_DATA=$SYSTEM_DATA"<nodewatcher_version>$nodewatcher_version</nodewatcher_version>" SYSTEM_DATA=$SYSTEM_DATA"<firmware_version>$FIRMWARE_VERSION</firmware_version>" SYSTEM_DATA=$SYSTEM_DATA"<firmware_community>$FIRMWARE_COMMUNITY</firmware_community>"
Reviewed-by: Tobias Klaus <tk+ff@meskal.net> On Samstag, 14. Mai 2016 14:32:22 CEST Tim Niemeyer wrote: > Signed-off-by: Tim Niemeyer <tim@tn-x.org> > --- > > 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 > cb568f4..8554ae9 100755 > --- a/src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher > +++ b/src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher > @@ -95,7 +95,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="<fastd_version>$(/usr/bin/fastd -v | awk '{ print $2 > }')</fastd_version>" + fi > nodewatcher_version=$SCRIPT_VERSION > > if [ -f "$SCRIPT_STATUS_FILE" ]; then > @@ -137,7 +139,7 @@ crawl() { > SYSTEM_DATA=$SYSTEM_DATA"<local_time>$local_time</local_time>" > SYSTEM_DATA=$SYSTEM_DATA"<batman_advanced_version>$batman_adv_version</bat > man_advanced_version>" > SYSTEM_DATA=$SYSTEM_DATA"<kernel_version>$kernel_version</kernel_version>" > - SYSTEM_DATA=$SYSTEM_DATA"<fastd_version>$fastd_version</fastd_version>" > + SYSTEM_DATA=$SYSTEM_DATA"$fastd_version" > SYSTEM_DATA=$SYSTEM_DATA"<nodewatcher_version>$nodewatcher_version</nodewa > tcher_version>" > SYSTEM_DATA=$SYSTEM_DATA"<firmware_version>$FIRMWARE_VERSION</firmware_vers > ion>" > SYSTEM_DATA=$SYSTEM_DATA"<firmware_community>$FIRMWARE_COMMUNITY</firmware_ > community>"
Signed-off-by: Tim Niemeyer <tim@tn-x.org> --- src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)