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