* 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) Upstream-commit: 5e3b643ce6f43d02fc7fe88eba41d583044a2efd Component: engine
This commit is contained in:
@ -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
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user