ソースを参照

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

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.
Matthias Schiffer 8 年 前
コミット
2331cb194e

+ 1 - 1
package/gluon-mesh-batman-adv-core/luasrc/lib/gluon/upgrade/300-gluon-mesh-batman-adv-core-wan

@@ -5,5 +5,5 @@ local uci = require('luci.model.uci').cursor()
 
 
 -- 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')

+ 1 - 1
package/gluon-mesh-batman-adv-core/luasrc/lib/gluon/upgrade/340-gluon-mesh-batman-adv-core-mesh-on-lan

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

+ 1 - 1
package/gluon-mesh-vpn-fastd/luasrc/lib/gluon/upgrade/400-mesh-vpn-fastd

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