clearlinux/docker
2
0
Fork 0
mirror of https://github.com/clearlinux/docker.git synced 2026-10-04 15:58:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Setting iptables=false should propagate to ip-masq=false

Browse Source 
Signed-off-by: Jessica Frazelle <jess@docker.com>
This commit is contained in:
Jessica Frazelle
2014-10-16 11:52:14 -07:00
parent dc243c812b
commit 3893e220e8
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
daemon/daemon.go
+1 -1
View File
@@ -731,7 +731,7 @@ func NewDaemonFromDirectory(config *Config, eng *engine.Engine) (*Daemon, error)
return nil, fmt.Errorf("You specified --iptables=false with --icc=false. ICC uses iptables to function. Please set --icc or --iptables to true.")
}
if !config.EnableIptables && config.EnableIpMasq {
return nil, fmt.Errorf("You specified --iptables=false with --ipmasq=true. IP masquerading uses iptables to function. Please set --ipmasq to false or --iptables to true.")
config.EnableIpMasq = false
}
config.DisableNetwork = config.BridgeIface == disableNetworkBridge