From b57bc04e1caf781479afc6332879c97a94216caa Mon Sep 17 00:00:00 2001
From: Markus Hauschild <markus@moepman.eu>
Date: Thu, 9 Nov 2017 21:05:47 +0100
Subject: [PATCH] Fixed MAC addresses for br/bat-interfaces

---
 roles/mesh-interfaces/templates/mesh.conf.j2 | 23 +++++++++++---------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/roles/mesh-interfaces/templates/mesh.conf.j2 b/roles/mesh-interfaces/templates/mesh.conf.j2
index ce094ef..640c744 100644
--- a/roles/mesh-interfaces/templates/mesh.conf.j2
+++ b/roles/mesh-interfaces/templates/mesh.conf.j2
@@ -3,28 +3,31 @@
 # br-{{ site_code }}
 auto br-{{ site_code }}
 iface br-{{ site_code }}
+	hwaddress	f2:00:90:00:{{ gateway_id }}:20
+	mtu		1500
+	#
 	bridge-fd	0
 	bridge-ports	bat-{{ site_code }}
 	bridge-stp	no
 	#
-	address	{{ batman_ipv4 }}
-	address	{{ batman_ipv6 }}
-	mtu	1500
+	address		{{ batman_ipv4 }}
+	address		{{ batman_ipv6 }}
 
 # bat-{{ site_code }}
 auto bat-{{ site_code }}
 iface bat-{{ site_code }}
-	batman-hop-penalty	5
-	batman-ifaces	dmy-{{ site_code }} vpn-{{ site_code }}
-	batman-ifaces-ignore-regex	.*_.*
+	hwaddress	f2:00:90:00:{{ gateway_id }}:20
+	mtu		1500
 	#
-	mtu	1500
+	batman-hop-penalty	5
+	batman-ifaces		dmy-{{ site_code }} vpn-{{ site_code }}
+	batman-ifaces-ignore-regex	.*_.*
 	#
 	up /usr/sbin/batctl -m bat-{{ site_code }} gw_mode server 100000 100000
 
 # dmy-{{ site_code }}
 auto dmy-{{ site_code }}
 iface dmy-{{ site_code }}
-	hwaddress f2:00:90:00:{{ gateway_id }}:00
-	link-type dummy
-	mtu 1560
+	hwaddress	f2:00:90:00:{{ gateway_id }}:00
+	link-type	dummy
+	mtu		1560