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

Merge pull request #111 from mheon/crio_1206 

Carry CRI-O #1206 to fix a potential runtime issue
This commit is contained in:
Daniel J Walsh 2017-12-11 10:44:57 -06:00 committed by GitHub
parent 7e179b6ddb 00df767a99
commit 915410aaff
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libpod/oci.go
View File

@ -302,7 +302,7 @@ func (r *OCIRuntime) createContainer(ctr *Container, cgroupParent string) (err e
func (r *OCIRuntime) updateContainerStatus(ctr *Container) error {
state := new(spec.State)
out, err := exec.Command(r.path, "state", ctr.ID()).CombinedOutput()
out, err := exec.Command(r.path, "state", ctr.ID()).Output()
if err != nil {
return errors.Wrapf(err, "error getting container %s state. stderr/out: %s", ctr.ID(), out)
}