p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

DisableNetworkBidge doesn't need to be public anymore

Browse Source 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: 67c254a60a77c1f80804be7ab97353530987c846
Component: engine
This commit is contained in:
Jessica Frazelle
2014-09-16 10:37:50 -07:00
parent f8b8f5b4f2
commit a1bab7db37
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/engine/daemon/config.go
View File

@ -10,7 +10,7 @@ import (
const (
defaultNetworkMtu = 1500
DisableNetworkBridge = "none"
disableNetworkBridge = "none"
)
// Config define the configuration of a docker daemon

3
components/engine/daemon/daemon.go
View File

@ -690,8 +690,7 @@ func NewDaemonFromDirectory(config *Config, eng *engine.Engine) (*Daemon, error)
if !config.EnableIptables && !config.InterContainerCommunication {
return nil, fmt.Errorf("You specified --iptables=false with --icc=false. ICC uses iptables to function. Please set --icc or --iptables to true.")
}
// FIXME: DisableNetworkBidge doesn't need to be public anymore
config.DisableNetwork = config.BridgeIface == DisableNetworkBridge
config.DisableNetwork = config.BridgeIface == disableNetworkBridge
// Claim the pidfile first, to avoid any and all unexpected race conditions.
// Some of the init doesn't need a pidfile lock - but let's not try to be smart.