From 2331cb194e9428550b784c8d6cf81b1e76aa9176 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Tue, 30 Aug 2016 21:18:20 +0200
Subject: [PATCH] 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.
---
.../luasrc/lib/gluon/upgrade/300-gluon-mesh-batman-adv-core-wan | 2 +-
.../gluon/upgrade/340-gluon-mesh-batman-adv-core-mesh-on-lan | 2 +-
.../luasrc/lib/gluon/upgrade/400-mesh-vpn-fastd | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/package/gluon-mesh-batman-adv-core/luasrc/lib/gluon/upgrade/300-gluon-mesh-batman-adv-core-wan b/package/gluon-mesh-batman-adv-core/luasrc/lib/gluon/upgrade/300-gluon-mesh-batman-adv-core-wan
index eafadb712..0d64d5b44 100755
--- a/package/gluon-mesh-batman-adv-core/luasrc/lib/gluon/upgrade/300-gluon-mesh-batman-adv-core-wan
+++ b/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')
diff --git a/package/gluon-mesh-batman-adv-core/luasrc/lib/gluon/upgrade/340-gluon-mesh-batman-adv-core-mesh-on-lan b/package/gluon-mesh-batman-adv-core/luasrc/lib/gluon/upgrade/340-gluon-mesh-batman-adv-core-mesh-on-lan
index 2cc0d9896..116944f84 100755
--- a/package/gluon-mesh-batman-adv-core/luasrc/lib/gluon/upgrade/340-gluon-mesh-batman-adv-core-mesh-on-lan
+++ b/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
diff --git a/package/gluon-mesh-vpn-fastd/luasrc/lib/gluon/upgrade/400-mesh-vpn-fastd b/package/gluon-mesh-vpn-fastd/luasrc/lib/gluon/upgrade/400-mesh-vpn-fastd
index 6f2095f2f..e660db9eb 100755
--- a/package/gluon-mesh-vpn-fastd/luasrc/lib/gluon/upgrade/400-mesh-vpn-fastd
+++ b/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),
}
)
--
GitLab