Merge pull request #2020 from mrunalp/conmon_status_1.13

[1.13] oci: read conmon process status
cri-o · Jan 15, 2019 · 712f132 · 712f132
2 parents 1fecbd3 + 9757246
commit 712f132
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/oci/oci.go b/oci/oci.go
@@ -305,6 +305,7 @@ func (r *Runtime) CreateContainer(c *Container, cgroupParent string) (err error)
 	someData := []byte{0}
 	_, err = parentStartPipe.Write(someData)
 	if err != nil {
+		cmd.Wait()
 		return err
 	}