diff options
| author | Daniel J Walsh <dwalsh@redhat.com> | 2018-02-05 16:02:18 -0500 |
|---|---|---|
| committer | Daniel J Walsh <dwalsh@redhat.com> | 2018-02-05 16:35:43 -0500 |
| commit | d1c0c42a0812e599298321425fa8e6ccfa2e09e1 (patch) | |
| tree | 5934ee3ad0ffc26ad36d906260af544e3f85c7e2 | |
| parent | 3609b82fe6f5fe268cdbe9f8aba43140c4e81f90 (diff) | |
| download | podman-d1c0c42a0812e599298321425fa8e6ccfa2e09e1.tar.gz podman-d1c0c42a0812e599298321425fa8e6ccfa2e09e1.tar.bz2 podman-d1c0c42a0812e599298321425fa8e6ccfa2e09e1.zip | |
Need to add LISTEN_PID environment variable to conmon command
Without this field then conmon will not pass the proper data down to
the OCI Runtime.
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
| -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 4ca0bfbef..278c67829 100644 --- a/libpod/oci.go +++ b/libpod/oci.go @@ -215,7 +215,7 @@ func (r *OCIRuntime) createContainer(ctr *Container, cgroupParent string) (err e cmd.Env = append(cmd.Env, fmt.Sprintf("NOTIFY_SOCKET=%s", notify)) } if listenfds, ok := os.LookupEnv("LISTEN_FDS"); ok { - cmd.Env = append(cmd.Env, fmt.Sprintf("LISTEN_FDS=%s", listenfds)) + cmd.Env = append(cmd.Env, fmt.Sprintf("LISTEN_FDS=%s", listenfds), "LISTEN_PID=1") fds := activation.Files(false) cmd.ExtraFiles = append(cmd.ExtraFiles, fds...) } |