| Message ID | 1465658452-20513-6-git-send-email-tim@tn-x.org |
|---|---|
| State | Accepted, archived |
| Commit | c33952656c2925cc28a7ce43c204a10298a32d53 |
| 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 b343b84..3733ef2 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="<fastd_version>$(/usr/bin/fastd -v | awk '{ print $2 }')</fastd_version>" + fi nodewatcher_version=$SCRIPT_VERSION if [ -f "$SCRIPT_STATUS_FILE" ]; then @@ -136,7 +138,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: Jan Kraus <mayosemmel@gmail.com> Am Samstag, den 11.06.2016, 17:20 +0200 schrieb Tim Niemeyer: > Signed-off-by: Tim Niemeyer <tim@tn-x.org> > --- > > Changes in v2: > - Rebased with spaces > > 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 b343b84..3733ef2 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="<fastd_version>$(/usr/bin/fastd -v | awk '{ print $2 }')</fastd_version>" > + fi > nodewatcher_version=$SCRIPT_VERSION > > if [ -f "$SCRIPT_STATUS_FILE" ]; then > @@ -136,7 +138,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>" > -- > 2.1.4 >
Signed-off-by: Tim Niemeyer <tim@tn-x.org> --- Changes in v2: - Rebased with spaces src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)