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

gluon-mesh-batman-adv-core: don't break network configuration on upgrades with mesh_on_lan=true

Browse Source
This commit is contained in:
Matthias Schiffer 2015-05-28 01:44:25 +02:00
parent a42db7a71f
commit 317478e2b7
1 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
package/gluon-mesh-batman-adv-core/files/lib/gluon/upgrade/340-gluon-mesh-batman-adv-core-mesh-on-lan
View File

@ -1,23 +1,32 @@
#!/usr/bin/lua #!/usr/bin/lua
local site = require 'gluon.site_config' local site = require 'gluon.site_config'
local uci = require 'luci.model.uci'
local util = require 'gluon.util' local util = require 'gluon.util'
local sysconfig = require 'gluon.sysconfig' local sysconfig = require 'gluon.sysconfig'
local c = uci.cursor() local uci = require('luci.model.uci').cursor()
local lutil = require 'luci.util'
if sysconfig.lan_ifname then if sysconfig.lan_ifname and not uci:get('network', 'mesh_lan') then
if not c:get('network', 'mesh_lan') then local enable = site.mesh_on_lan
c:section('network', 'interface', 'mesh_lan',
if enable then
local interfaces = uci:get('network', 'client', 'ifname')
if interfaces and lutil.contains(interfaces:split(' '), sysconfig.lan_ifname) then
enable = false
end
end
uci:section('network', 'interface', 'mesh_lan',
{ ifname = sysconfig.lan_ifname { ifname = sysconfig.lan_ifname
, proto = 'batadv' , proto = 'batadv'
, mesh = 'bat0' , mesh = 'bat0'
, macaddr = util.generate_mac(1, 1) , macaddr = util.generate_mac(1, 1)
, auto = site.mesh_on_lan and 1 or 0 , auto = enable and 1 or 0
}) })
end
uci:save('network')
uci:commit('network')
end end
c:save('network')
c:commit('network')