diff options
| author | Daniel J Walsh <dwalsh@redhat.com> | 2017-12-11 10:44:57 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-11 10:44:57 -0600 |
| commit | 915410aafffbe91707e2dd6562a1bfb237815f88 (patch) | |
| tree | 641eff8c58a53d19a09d0bda20f685be12623def /libpod/oci.go | |
| parent | 7e179b6ddb7b70c48a750bf1b4afefbe5c8e72cc (diff) | |
| parent | 00df767a99fc5646201c31a2ddef4587cc88c2d6 (diff) | |
| download | podman-915410aafffbe91707e2dd6562a1bfb237815f88.tar.gz podman-915410aafffbe91707e2dd6562a1bfb237815f88.tar.bz2 podman-915410aafffbe91707e2dd6562a1bfb237815f88.zip | |
Merge pull request #111 from mheon/crio_1206
Carry CRI-O #1206 to fix a potential runtime issue
Diffstat (limited to 'libpod/oci.go')
| -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 323e97273..49bf95bc5 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) } |