docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5998 from crosbymichael/iptables-wait 

Add wait flag to iptables
This commit is contained in:
Tibor Vass 2014-05-23 13:31:35 -07:00
parent 0874b85627 b315c380f4
commit 174ab74755
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/iptables/iptables.go
View File

@ -150,7 +150,7 @@ func Raw(args ...string) ([]byte, error) {
if os.Getenv("DEBUG") != "" { if os.Getenv("DEBUG") != "" {
fmt.Printf("[DEBUG] [iptables]: %s, %v\n", path, args) fmt.Printf("[DEBUG] [iptables]: %s, %v\n", path, args)
} }
output, err := exec.Command(path, args...).CombinedOutput() output, err := exec.Command(path, append([]string{"--wait"}, args...)...).CombinedOutput()
if err != nil { if err != nil {
return nil, fmt.Errorf("iptables failed: iptables %v: %s (%s)", strings.Join(args, " "), output, err) return nil, fmt.Errorf("iptables failed: iptables %v: %s (%s)", strings.Join(args, " "), output, err)
} }