浏览代码

* do not consider iptables' output an error in case of xtables lock
Docker-DCO-1.1-Signed-off-by: Giuseppe Mazzotta <gdm85@users.noreply.github.com> (github: gdm85)

Giuseppe Mazzotta 11 年之前
父节点
当前提交
5e3b643ce6
共有 1 个文件被更改,包括 5 次插入0 次删除
  1. 5 0
      pkg/iptables/iptables.go

+ 5 - 0
pkg/iptables/iptables.go

@@ -166,5 +166,10 @@ func Raw(args ...string) ([]byte, error) {
 		return nil, fmt.Errorf("iptables failed: iptables %v: %s (%s)", strings.Join(args, " "), output, err)
 	}
 
+	// ignore iptables' message about xtables lock
+	if strings.Contains(string(output), "waiting for it to exit") {
+		output = []byte("")
+	}
+
 	return output, err
 }