From 5e3b643ce6f43d02fc7fe88eba41d583044a2efd Mon Sep 17 00:00:00 2001 From: Giuseppe Mazzotta Date: Thu, 29 May 2014 15:57:29 +0200 Subject: [PATCH] * do not consider iptables' output an error in case of xtables lock Docker-DCO-1.1-Signed-off-by: Giuseppe Mazzotta (github: gdm85) --- pkg/iptables/iptables.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkg/iptables/iptables.go b/pkg/iptables/iptables.go index b44c452233..e3f4d74b9d 100644 --- a/pkg/iptables/iptables.go +++ b/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 }