From 2784055672138a849b736098c8a4312b06d8d227 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Fri, 1 Mar 2019 22:04:05 +0100 Subject: [PATCH] Revert "Merge pull request #2287 from thaJeztah/18.03_backport_iptables_legacy" This reverts commit 5a2b0bd6a1e13562c6711c6a5c1f22c97a0ffac3, reversing changes made to c2b3907ffccf3ffc6a5c19bbda08620b140cbe84. Signed-off-by: Sebastiaan van Stijn --- iptables/iptables.go | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/iptables/iptables.go b/iptables/iptables.go index e1b779c57f..50896d935a 100644 --- 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 {