Skip to content

Commit

Permalink
Revert "Merge pull request moby#2287 from thaJeztah/18.03_backport_ip…
Browse files Browse the repository at this point in the history
…tables_legacy"

This reverts commit 5a2b0bd, reversing
changes made to c2b3907.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
  • Loading branch information
thaJeztah committed Mar 1, 2019
1 parent 3e2444e commit 2784055
Showing 1 changed file with 2 additions and 7 deletions.
9 changes: 2 additions & 7 deletions iptables/iptables.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down

0 comments on commit 2784055

Please sign in to comment.