0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #2343 from arkodg/remove-iptables-legacy

Browse source 
Revert "debian has iptables-legacy and iptables-nft now"
This commit is contained in:
Flavio Crisciani 2019-03-01 12:04:23 -08:00 • committed by GitHub
commit daaa8f1e78
1 changed files with 2 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
libnetwork/iptables/iptables.go
View file

@ -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 {