Merge pull request #6105 from gdm85/master
Do not consider iptables' output an error in case of xtables lock Upstream-commit: 189c600b3ba36934c074eb6769e23989ef22fda7 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