Commit 992a8994 authored by Arnaud Rebillout's avatar Arnaud Rebillout

Drop libnetwork patches already applied upstream

This version of docker.io vendors libnetwork at
c9029898e32f7c89bbb81511fbb721df252ce61a, which already has this commit
applied.

(see file engine/vendor.conf to know which commit of libnetwork is
vendored).
Signed-off-by: Arnaud Rebillout's avatarArnaud Rebillout <arnaud.rebillout@collabora.com>
parent 53c6d769
From: Arko Dasgupta <arko.dasgupta@docker.com>
Date: Fri, 1 Mar 2019 11:43:02 -0800
Subject: [PATCH] Revert "debian has iptables-legacy and iptables-nft now"
This reverts commit 7da66eea9f68e4abc83ed2892114ec565eddd66a.
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>
Origin: upstream, https://github.com/docker/libnetwork/pull/2343
---
libnetwork/iptables/iptables.go | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/libnetwork/iptables/iptables.go b/libnetwork/iptables/iptables.go
index 6a108e93d0..4b8d8832e9 100644
--- a/libnetwork/iptables/iptables.go
+++ b/libnetwork/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 {
......@@ -27,7 +27,6 @@ engine-test-noinstall.patch
go-metrics_prometheus-fix_Observer.patch
libnetwork_proto.patch
libnetwork-revert-iptables-legacy.patch
libnetwork_proto_no_unrecognized_all.patch
mips-add-specific-signal-file.patch
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment