From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 13 Aug 2015 18:03:15 +0000 (+0200)
Subject: bridge: Remove unnecessary call of mac_generate
X-Git-Tag: 007~26
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0430028ae536de74a021d54aeb0883b080cfc500;p=network.git

bridge: Remove unnecessary call of mac_generate

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/src/hooks/zones/bridge b/src/hooks/zones/bridge
index 7b4e7a4e..63ca004a 100644
--- a/src/hooks/zones/bridge
+++ b/src/hooks/zones/bridge
@@ -29,7 +29,7 @@ HOOK_SETTINGS="${HOOK_SETTINGS} STP_PRIORITY MAC MTU"
 HOOK_PORT_SETTINGS="COST PRIORITY"
 
 # Default values
-MAC=$(mac_generate)
+MAC=""
 MTU=1500
 STP="on"
 STP_MODE="rstp"
@@ -78,6 +78,9 @@ hook_parse_cmdline() {
 		esac
 		shift
 	done
+
+	# Generate a random MAC address if the user passed no one
+	isset MAC || MAC="$(mac_generate)"
 }
 
 hook_up() {