diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-07-03 12:45:48 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-03 12:45:48 +0200 |
| commit | bf7d5a9ce8455e4480b5e0ef92b02099f119ee71 (patch) | |
| tree | 6a5cc5d3d9e68940c423e69e81ab375972d72f15 /libpod/oci_linux.go | |
| parent | 2fbf71663248c578acd68fe393fb04fa3b2606e4 (diff) | |
| parent | 38c6199b80c5de5d965ab1bcf05820567a36813c (diff) | |
| download | podman-bf7d5a9ce8455e4480b5e0ef92b02099f119ee71.tar.gz podman-bf7d5a9ce8455e4480b5e0ef92b02099f119ee71.tar.bz2 podman-bf7d5a9ce8455e4480b5e0ef92b02099f119ee71.zip | |
Merge pull request #3483 from mheon/get_conmon_pid
Store and print PID of conmon
Diffstat (limited to 'libpod/oci_linux.go')
| -rw-r--r-- | libpod/oci_linux.go | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libpod/oci_linux.go b/libpod/oci_linux.go index 7d9f47ae2..24502ef4f 100644 --- a/libpod/oci_linux.go +++ b/libpod/oci_linux.go @@ -446,6 +446,9 @@ func (r *OCIRuntime) createOCIContainer(ctr *Container, cgroupParent string, res return errors.Wrapf(define.ErrInternal, "container create failed") } ctr.state.PID = ss.si.Pid + if cmd.Process != nil { + ctr.state.ConmonPID = cmd.Process.Pid + } case <-time.After(ContainerCreateTimeout): return errors.Wrapf(define.ErrInternal, "container creation timeout") } |