diff options
| author | Matthew Heon <matthew.heon@gmail.com> | 2018-02-07 18:59:50 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-07 18:59:50 -0500 |
| commit | e47c2e390a199528ad032cbcf64e38b40d6ddb06 (patch) | |
| tree | 0820546509975f0cbdcb1bcfac68178306a083f7 /libpod | |
| parent | dd9ecc7a23595e0478a0e4606e22bd48276ba4f1 (diff) | |
| parent | d1c0c42a0812e599298321425fa8e6ccfa2e09e1 (diff) | |
| download | podman-e47c2e390a199528ad032cbcf64e38b40d6ddb06.tar.gz podman-e47c2e390a199528ad032cbcf64e38b40d6ddb06.tar.bz2 podman-e47c2e390a199528ad032cbcf64e38b40d6ddb06.zip | |
Merge pull request #293 from rhatdan/sd_notify
Need to add LISTEN_PID environment variable to conmon command
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 86313a493..1fa85bda0 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...) } |