[PATCH] nodewatcher: Fix leftover use of batman-adv DEBUGFS

[Adrian Schmutzler]

Hallo Robert,

du hast zwar Recht, scheinbar ist aber auch das sysfs deprecated:

Fri Jul 26 22:05:03 2019 kern.warn kernel: [ 1044.625039] batman_adv: [Deprecated]: grep (pid 4371) Use of sysfs file "iface_status".
Fri Jul 26 22:05:03 2019 kern.warn kernel: [ 1044.625039] Use batadv genl family instead
Fri Jul 26 22:05:10 2019 kern.warn kernel: [ 1044.638822] batman_adv: [Deprecated]: grep (pid 4371) Use of sysfs file "iface_status".
Fri Jul 26 22:05:10 2019 kern.warn kernel: [ 1044.638822] Use batadv genl family instead

(Kommt bei Firmware mit openwrt-19.07).

So gesehen ist nur die Commit Message falsch ;-)

Grüße

Adrian

> -----Original Message-----
> From: franken-dev [mailto:franken-dev-bounces at freifunk.net] On Behalf Of
> robert
> Sent: Montag, 29. Juli 2019 09:40
> To: franken-dev at freifunk.net
> Subject: Re: [PATCH] nodewatcher: Fix leftover use of batman-adv DEBUGFS
> 
> Hallo Adrian,
> 
> das kommt nicht aus debugfs sondern sysfs und bleibt uns erhalten.
> 
> batman debugfs: /sys/kernel/debug/batman_adv/
> 
> Grüße Robert
> 
> 
> Am 28.07.19 um 21:59 schrieb Adrian Schmutzler:
> > In d9ec8edb15941 ("batman-adv: Move from DEBUGFS to batctl") we
> > switched from deprecated DEBUGFS to batctl.
> >
> > This patch fixes a reference to iface_status which has been
> > overlooked.
> >
> > Signed-off-by: Adrian Schmutzler <freifunk at adrianschmutzler.de>
> > ---
> >  src/packages/fff/fff-nodewatcher/Makefile                | 2 +-
> >  .../fff/fff-nodewatcher/files/usr/sbin/nodewatcher       | 9 ++++-----
> >  2 files changed, 5 insertions(+), 6 deletions(-)
> >
> > diff --git a/src/packages/fff/fff-nodewatcher/Makefile b/src/packages/fff/fff-
> nodewatcher/Makefile
> > index a5551e04..be5f267a 100644
> > --- a/src/packages/fff/fff-nodewatcher/Makefile
> > +++ b/src/packages/fff/fff-nodewatcher/Makefile
> > @@ -1,7 +1,7 @@
> >  include $(TOPDIR)/rules.mk
> >
> >  PKG_NAME:=fff-nodewatcher
> > -PKG_RELEASE:=53
> > +PKG_RELEASE:=54
> >
> >  PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
> >
> > diff --git a/src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher
> b/src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher
> > index 90509ba1..09f6843d 100755
> > --- a/src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher
> > +++ b/src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher
> > @@ -12,7 +12,7 @@ if ! lock -n "$lockfile"; then
> >  fi
> >  trap "lock -u \"$lockfile\"" INT TERM EXIT
> >
> > -SCRIPT_VERSION="53"
> > +SCRIPT_VERSION="54"
> >
> >  #Get the configuration from the uci configuration file
> >  #If it does not exists, then get it from a normal bash file with variables.
> > @@ -219,10 +219,9 @@ crawl() {
> >      err "$(date): Collecting information from batman advanced and its
> interfaces"
> >      #B.A.T.M.A.N. advanced
> >      if [ -f /sys/module/batman_adv/version ]; then
> > -        for iface in $(grep active /sys/class/net/*/batman_adv/iface_status); do
> > -            status=${iface#*:}
> > -            iface=${iface%/batman_adv/iface_status:active}
> > -            iface=${iface#/sys/class/net/}
> > +        for iface in $(batctl if | sed 's/ //'); do
> > +            status=${iface##*:}
> > +            iface=${iface%%:*}
> >
> BATMAN_ADV_INTERFACES=$BATMAN_ADV_INTERFACES"<$iface><name>$if
> ace</name><status>$status</status></$iface>"
> >          done
> >
-------------- nächster Teil --------------
Ein Dateianhang mit Binärdaten wurde abgetrennt...
Dateiname   : nicht verfügbar
Dateityp    : application/pgp-signature
Dateigröße  : 834 bytes
Beschreibung: nicht verfügbar
URL         : <https://lists.freifunk.net/pipermail/franken-dev-freifunk.net/attachments/20190729/882d104a/attachment.sig>