diff options
| author | Matthew Heon <matthew.heon@gmail.com> | 2017-12-07 14:44:21 -0500 |
|---|---|---|
| committer | Matthew Heon <matthew.heon@gmail.com> | 2017-12-07 14:44:21 -0500 |
| commit | 00df767a99fc5646201c31a2ddef4587cc88c2d6 (patch) | |
| tree | b19898539fe80327c5aeb2c070c09d16e60955f5 /libpod | |
| parent | 8d31ec2ad775c97c4b860eb24a3481092b6e88e3 (diff) | |
| download | podman-00df767a99fc5646201c31a2ddef4587cc88c2d6.tar.gz podman-00df767a99fc5646201c31a2ddef4587cc88c2d6.tar.bz2 podman-00df767a99fc5646201c31a2ddef4587cc88c2d6.zip | |
Carry CRI-O #1206 to fix a potential runtime issue
Signed-off-by: Matthew Heon <matthew.heon@gmail.com>
Diffstat (limited to 'libpod')
| -rw-r--r-- | libpod/oci.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libpod/oci.go b/libpod/oci.go index 6ea6bb64f..3daae37f3 100644 --- a/libpod/oci.go +++ b/libpod/oci.go @@ -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) } |