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

Revert "debian has iptables-legacy and iptables-nft now"

Browse source 
This reverts commit 7adcd856fe.

Libnetwork should only use the iptables binary. Iptables v1.8 and above
uses the nftables backend. The translations for all the rules used by
libnetwork is supported by the new iptables binary.

Signed-off-by: Arko Dasgupta <arko.dasgupta@docker.com>
This commit is contained in:
Arko Dasgupta 2019-03-01 11:43:02 -08:00
parent 8e7aead94f
commit 068ca7d046
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 {