From 34e0451e45e59ac1a1195efe3605ab6d72e241bf Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sat, 11 Jul 2015 18:27:35 +0200
Subject: [PATCH] gluon-mesh-batman-adv-core: unconditionally set the WAN MAC
address
This fixes MAC address conflicts on devices which use the eth0 as primary
address.
---
.../gluon/upgrade/300-gluon-mesh-batman-adv-core-wan | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/package/gluon-mesh-batman-adv-core/files/lib/gluon/upgrade/300-gluon-mesh-batman-adv-core-wan b/package/gluon-mesh-batman-adv-core/files/lib/gluon/upgrade/300-gluon-mesh-batman-adv-core-wan
index f84a104d1..c9084ea67 100755
--- a/package/gluon-mesh-batman-adv-core/files/lib/gluon/upgrade/300-gluon-mesh-batman-adv-core-wan
+++ b/package/gluon-mesh-batman-adv-core/files/lib/gluon/upgrade/300-gluon-mesh-batman-adv-core-wan
@@ -1,14 +1,11 @@
#!/usr/bin/lua
-local sysconfig = require 'gluon.sysconfig'
local util = require 'gluon.util'
local uci = require('luci.model.uci').cursor()
-if sysconfig.wan_ifname:match('%.') then
- -- fix up duplicate mac addresses (for mesh-on-WAN)
- uci:set('network', 'wan', 'macaddr', util.generate_mac(1, 0))
- uci:save('network')
- uci:commit('network')
-end
+-- fix up duplicate mac addresses (for mesh-on-WAN)
+uci:set('network', 'wan', 'macaddr', util.generate_mac(1, 0))
+uci:save('network')
+uci:commit('network')
--
GitLab