From patchwork Sun Apr 19 13:40:20 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [4/4] nodewatcher: Only report batman_adv version if installed From: Fabian Blaese X-Patchwork-Id: 1351 Message-Id: <20200419134020.1389582-4-fabian@blaese.de> To: franken-dev@freifunk.net Date: Sun, 19 Apr 2020 15:40:20 +0200 The version of batman_adv is read in a script inside fff-nodewatcher, so it is possible that batman_adv is not installed. Therefore, a new test is added to check if batman_adv is installed, before reading and reporting its version. Signed-off-by: Fabian Bläse Reviewed-by: Adrian Schmutzler --- .../files/usr/lib/nodewatcher.d/10-systemdata.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/packages/fff/fff-nodewatcher/files/usr/lib/nodewatcher.d/10-systemdata.sh b/src/packages/fff/fff-nodewatcher/files/usr/lib/nodewatcher.d/10-systemdata.sh index 814a830..37b9891 100755 --- a/src/packages/fff/fff-nodewatcher/files/usr/lib/nodewatcher.d/10-systemdata.sh +++ b/src/packages/fff/fff-nodewatcher/files/usr/lib/nodewatcher.d/10-systemdata.sh @@ -61,7 +61,10 @@ SYSTEM_DATA="$SYSTEM_DATA$load" debug "Collecting version information" -SYSTEM_DATA="$SYSTEM_DATA$(cat /sys/module/batman_adv/version)" +if [ -e /sys/module/batman_adv/version ]; then + SYSTEM_DATA="$SYSTEM_DATA$(cat /sys/module/batman_adv/version)" +fi + SYSTEM_DATA="$SYSTEM_DATA$(uname -r)" SYSTEM_DATA="$SYSTEM_DATA$SCRIPT_VERSION"