Przeglądaj źródła

Merge pull request #17186 from LK4D4/icc_clear

Use more clear message for icc=false + iptables=false
Jess Frazelle 9 lat temu
rodzic
commit
b135f758d7
1 zmienionych plików z 1 dodań i 1 usunięć
  1. 1 1
      daemon/daemon_unix.go

+ 1 - 1
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.")
 		return fmt.Errorf("You specified -b & --bip, mutually exclusive options. Please specify only one.")
 	}
 	}
 	if !config.Bridge.EnableIPTables && !config.Bridge.InterContainerCommunication {
 	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 {
 	if !config.Bridge.EnableIPTables && config.Bridge.EnableIPMasq {
 		config.Bridge.EnableIPMasq = false
 		config.Bridge.EnableIPMasq = false