From 67c254a60a77c1f80804be7ab97353530987c846 Mon Sep 17 00:00:00 2001 From: Jessica Frazelle Date: Tue, 16 Sep 2014 10:37:50 -0700 Subject: [PATCH] DisableNetworkBidge doesn't need to be public anymore Docker-DCO-1.1-Signed-off-by: Jessica Frazelle (github: jfrazelle) --- daemon/config.go | 2 +- daemon/daemon.go | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/daemon/config.go b/daemon/config.go index 07d41153a3..00ebc7a74d 100644 --- a/daemon/config.go +++ b/daemon/config.go @@ -10,7 +10,7 @@ import ( const ( defaultNetworkMtu = 1500 - DisableNetworkBridge = "none" + disableNetworkBridge = "none" ) // Config define the configuration of a docker daemon diff --git a/daemon/daemon.go b/daemon/daemon.go index b9c652cb4e..5fef43b357 100644 --- a/daemon/daemon.go +++ b/daemon/daemon.go @@ -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.