Explorar o código

Merge pull request #2285 from myobie/iptables-legacy

debian has iptables-legacy and iptables-nft now
Flavio Crisciani %!s(int64=6) %!d(string=hai) anos
pai
achega
941f87407d
Modificáronse 1 ficheiros con 7 adicións e 2 borrados
  1. 7 2
      libnetwork/iptables/iptables.go

+ 7 - 2
libnetwork/iptables/iptables.go

@@ -87,11 +87,16 @@ func initFirewalld() {
 }
 
 func detectIptables() {
-	path, err := exec.LookPath("iptables")
+	path, err := exec.LookPath("iptables-legacy") // debian has iptables-legacy and iptables-nft now
 	if err != nil {
-		return
+		path, err = exec.LookPath("iptables")
+		if err != nil {
+			return
+		}
 	}
+
 	iptablesPath = path
+
 	supportsXlock = exec.Command(iptablesPath, "--wait", "-L", "-n").Run() == nil
 	mj, mn, mc, err := GetVersion()
 	if err != nil {