Merge pull request #2344 from thaJeztah/18.09_backport_revert_2286

[18.09 backport] Revert "Merge pull request #2286 from thaJeztah/18.09_backport_iptables_legacy"
moby · Mar 5, 2019 · 4725f21 · 4725f21
2 parents f3d3985 + 2a85bb5
commit 4725f21
Showing 1 changed file with 2 additions and 7 deletions.
diff --git a/iptables/iptables.go b/iptables/iptables.go
@@ -87,16 +87,11 @@ func initFirewalld() {
 }
 
 func detectIptables() {
-	path, err := exec.LookPath("iptables-legacy") // debian has iptables-legacy and iptables-nft now
+	path, err := exec.LookPath("iptables")
 	if err != nil {
-		path, err = exec.LookPath("iptables")
-		if err != nil {
-			return
-		}
+		return
 	}
-
 	iptablesPath = path
-
 	supportsXlock = exec.Command(iptablesPath, "--wait", "-L", "-n").Run() == nil
 	mj, mn, mc, err := GetVersion()
 	if err != nil {