| Message ID | 20200419134020.1389582-4-fabian@blaese.de |
|---|---|
| State | Accepted |
| Headers | show |
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<batman_advanced_version>$(cat /sys/module/batman_adv/version)</batman_advanced_version>" +if [ -e /sys/module/batman_adv/version ]; then + SYSTEM_DATA="$SYSTEM_DATA<batman_advanced_version>$(cat /sys/module/batman_adv/version)</batman_advanced_version>" +fi + SYSTEM_DATA="$SYSTEM_DATA<kernel_version>$(uname -r)</kernel_version>" SYSTEM_DATA="$SYSTEM_DATA<nodewatcher_version>$SCRIPT_VERSION</nodewatcher_version>"
Hallo, Reviewed-by: Adrian Schmutzler <freifunk@adrianschmutzler.de> Ich prüfe immer lieber mit -s, aber das ist hier wohl egal. Habe auch nochmal nachgesehen, dass batman_advanced_version auch wirklich optional ist. Grüße Adrian > -----Original Message----- > From: franken-dev [mailto:franken-dev-bounces@freifunk.net] On Behalf > Of Fabian Bläse > Sent: Sonntag, 19. April 2020 15:40 > To: franken-dev@freifunk.net > Subject: [PATCH 4/4] nodewatcher: Only report batman_adv version if > installed > > 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 <fabian@blaese.de> > --- > .../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-sy > +++ stemdata.sh > @@ -61,7 +61,10 @@ SYSTEM_DATA="$SYSTEM_DATA$load" > > debug "Collecting version information" > > -SYSTEM_DATA="$SYSTEM_DATA<batman_advanced_version>$(cat > /sys/module/batman_adv/version)</batman_advanced_version>" > +if [ -e /sys/module/batman_adv/version ]; then > + SYSTEM_DATA="$SYSTEM_DATA<batman_advanced_version>$(cat > /sys/module/batman_adv/version)</batman_advanced_version>" > +fi > + > SYSTEM_DATA="$SYSTEM_DATA<kernel_version>$(uname - > r)</kernel_version>" > > SYSTEM_DATA="$SYSTEM_DATA<nodewatcher_version>$SCRIPT_VERSION > </nodewatcher_version>" > > -- > 2.26.0
applied.
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 <fabian@blaese.de> --- .../files/usr/lib/nodewatcher.d/10-systemdata.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)