Merge pull request #2286 from thaJeztah/18.09_backport_iptables_legacy

[18.09 backport] debian has iptables-legacy and iptables-nft now
moby · Nov 1, 2018 · f27ba28 · f27ba28
2 parents 6da50d1 + d933d51
commit f27ba28
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/iptables/iptables.go b/iptables/iptables.go
@@ -87,11 +87,16 @@ func initFirewalld() {
 }
 
 func detectIptables() {
-	path, err := exec.LookPath("iptables")
+	path, err := exec.LookPath("iptables-legacy") // debian has iptables-legacy and iptables-nft now
 	if err != nil {
-		return
+		path, err = exec.LookPath("iptables")
+		if err != nil {
+			return
+		}
 	}
+
 	iptablesPath = path
+
 	supportsXlock = exec.Command(iptablesPath, "--wait", "-L", "-n").Run() == nil
 	mj, mn, mc, err := GetVersion()
 	if err != nil {