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

Use more clear message for icc=false + iptables=false

Browse Source 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: ab495ab0d0a340dc45ce283dd7e2de6110485156
Component: engine
This commit is contained in:
Alexander Morozov
2015-10-19 14:19:21 -07:00
parent b4f9b290d4
commit ae482ee1b1
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -245,7 +245,7 @@ func checkConfigOptions(config *Config) error {
return fmt.Errorf("You specified -b & --bip, mutually exclusive options. Please specify only one.")
}
if !config.Bridge.EnableIPTables && !config.Bridge.InterContainerCommunication {
return fmt.Errorf("You specified --iptables=false with --icc=false. ICC uses iptables to function. Please set --icc or --iptables to true.")
return fmt.Errorf("You specified --iptables=false with --icc=false. ICC=false uses iptables to function. Please set --icc or --iptables to true.")
}
if !config.Bridge.EnableIPTables && config.Bridge.EnableIPMasq {
config.Bridge.EnableIPMasq = false