Merge pull request moby#17186 from LK4D4/icc_clear

Use more clear message for icc=false + iptables=false
BlancosWay · Oct 19, 2015 · b135f75 · b135f75
2 parents c766bcd + ab495ab
commit b135f75
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/daemon/daemon_unix.go b/daemon/daemon_unix.go
@@ -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