From 8c2801ba38bd3ad9e1cbdc8f3bbf7cb44081ee2c Mon Sep 17 00:00:00 2001 From: Michael Crosby Date: Wed, 5 Feb 2014 11:19:48 -0800 Subject: [PATCH] Fix bad rebase where bridgeiface was removed Docker-DCO-1.1-Signed-off-by: Michael Crosby (github: crosbymichael) Upstream-commit: 347dc3942704742c1d24983a1e9cb10ae7ab8839 Component: engine --- components/engine/config.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/components/engine/config.go b/components/engine/config.go index fc04c9ff16..dc6e8b554f 100644 --- a/components/engine/config.go +++ b/components/engine/config.go @@ -39,6 +39,7 @@ func DaemonConfigFromJob(job *engine.Job) *DaemonConfig { EnableIptables: job.GetenvBool("EnableIptables"), EnableIpForward: job.GetenvBool("EnableIpForward"), BridgeIP: job.Getenv("BridgeIP"), + BridgeIface: job.Getenv("BridgeIface"), DefaultIp: net.ParseIP(job.Getenv("DefaultIp")), InterContainerCommunication: job.GetenvBool("InterContainerCommunication"), GraphDriver: job.Getenv("GraphDriver"), @@ -51,7 +52,7 @@ func DaemonConfigFromJob(job *engine.Job) *DaemonConfig { } else { config.Mtu = GetDefaultNetworkMtu() } - config.DisableNetwork = job.Getenv("BridgeIface") == DisableNetworkBridge + config.DisableNetwork = config.BridgeIface == DisableNetworkBridge return config }