nils/gluon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gluon-mesh-batman-adv: remove remaining deprecated sysfs usage

Browse Source 
While we're at it, also slightly optimize proto_gluon_bat0_renew.
This commit is contained in:
Matthias Schiffer 2019-11-24 01:10:59 +01:00
parent f715a58fdb
commit b4101e54e0
No known key found for this signature in database
GPG Key ID: 16EF3F64CB201D9C
2 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package/gluon-mesh-batman-adv/files/lib/gluon/core/mesh/teardown.d/70-gluon-mesh-batman-adv
View File

@ -1,5 +1,5 @@
#!/bin/sh #!/bin/sh
lock /var/lock/gluon_bat0.lock lock /var/lock/gluon_bat0.lock
(echo 'none' > "/sys/class/net/$IFNAME/batman_adv/mesh_iface") 2>/dev/null batctl interface del "$IFNAME" 2>/dev/null
lock -u /var/lock/gluon_bat0.lock lock -u /var/lock/gluon_bat0.lock

12
package/gluon-mesh-batman-adv/files/lib/netifd/proto/gluon_bat0.sh
View File

@ -22,15 +22,9 @@ proto_gluon_bat0_renew() {
lock /var/lock/gluon_bat0.lock lock /var/lock/gluon_bat0.lock
local ifdump="$(ubus call network.interface dump)" ubus call network.interface dump | jsonfilter \
-e "@.interface[@.proto='gluon_mesh' && @.up=true].device" \
echo "$ifdump" | jsonfilter \ | xargs -r -n 1 batctl interface add
-e "@.interface[@.proto='gluon_mesh' && @.up=true]['device','data']" \
| while read dev; do
read data
echo bat0 > "/sys/class/net/$dev/batman_adv/mesh_iface"
done
lock -u /var/lock/gluon_bat0.lock lock -u /var/lock/gluon_bat0.lock
} }