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

gluon-mesh-batman-adv-core, gluon-mesh-vpn-fastd: switch MAC address assignment

Browse Source 
Switch to:

1. WAN
2. LAN
3. Mesh VPN

As WAN and LAN are setup in gluon-mesh-batman-adv-core (and will be moved
to gluon-core), while the mesh VPN has its own package, giving WAN and LAN
the first indices is preferable.
This commit is contained in:
Matthias Schiffer 2016-08-30 21:18:20 +02:00 committed by Christof Schulze
parent 736831b7d7
commit 48b3283c3e
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package/gluon-mesh-batman-adv-core/luasrc/lib/gluon/upgrade/300-gluon-mesh-batman-adv-core-wan
View File

@ -5,5 +5,5 @@ local uci = require('luci.model.uci').cursor()
-- fix up duplicate mac addresses (for mesh-on-WAN) -- fix up duplicate mac addresses (for mesh-on-WAN)
uci:set('network', 'wan', 'macaddr', util.get_mac(2)) uci:set('network', 'wan', 'macaddr', util.get_mac(1))
uci:save('network') uci:save('network')

2
package/gluon-mesh-batman-adv-core/luasrc/lib/gluon/upgrade/340-gluon-mesh-batman-adv-core-mesh-on-lan
View File

@ -18,7 +18,7 @@ uci:section('network', 'interface', 'mesh_lan', {
proto = 'batadv', proto = 'batadv',
mesh = 'bat0', mesh = 'bat0',
mesh_no_rebroadcast = '1', mesh_no_rebroadcast = '1',
macaddr = util.get_mac(3), macaddr = util.get_mac(2),
}) })
if uci:get('network', 'mesh_lan', 'auto') == nil then if uci:get('network', 'mesh_lan', 'auto') == nil then

2
package/gluon-mesh-vpn-fastd/luasrc/lib/gluon/upgrade/400-mesh-vpn-fastd
View File

@ -127,7 +127,7 @@ uci:section('network', 'interface', 'mesh_vpn',
proto = 'batadv', proto = 'batadv',
mesh = 'bat0', mesh = 'bat0',
mesh_no_rebroadcast = 1, mesh_no_rebroadcast = 1,
macaddr = util.get_mac(1), macaddr = util.get_mac(3),
} }
) )