Browse code

DisableNetworkBidge doesn't need to be public anymore

Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)

Jessica Frazelle authored on 2014/09/17 02:37:50
Showing 2 changed files
... ...
@@ -10,7 +10,7 @@ import (
10 10
 
11 11
 const (
12 12
 	defaultNetworkMtu    = 1500
13
-	DisableNetworkBridge = "none"
13
+	disableNetworkBridge = "none"
14 14
 )
15 15
 
16 16
 // Config define the configuration of a docker daemon
... ...
@@ -690,8 +690,7 @@ func NewDaemonFromDirectory(config *Config, eng *engine.Engine) (*Daemon, error)
690 690
 	if !config.EnableIptables && !config.InterContainerCommunication {
691 691
 		return nil, fmt.Errorf("You specified --iptables=false with --icc=false. ICC uses iptables to function. Please set --icc or --iptables to true.")
692 692
 	}
693
-	// FIXME: DisableNetworkBidge doesn't need to be public anymore
694
-	config.DisableNetwork = config.BridgeIface == DisableNetworkBridge
693
+	config.DisableNetwork = config.BridgeIface == disableNetworkBridge
695 694
 
696 695
 	// Claim the pidfile first, to avoid any and all unexpected race conditions.
697 696
 	// Some of the init doesn't need a pidfile lock - but let's not try to be smart.