diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-08-18 19:25:13 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-18 19:25:13 +0200 |
| commit | 438cbf4c8960db0b59a25a3fb38a778e24a69a40 (patch) | |
| tree | cd88f2c036854caabc4a41bf4030a6d11fd86a4f /libpod/oci_internal_linux.go | |
| parent | 76f327f73ff9f5ae67a30186007685b8a2e21d67 (diff) | |
| parent | e6673012b5da79714a83e7d99ff0a23c8f401cb9 (diff) | |
| download | podman-438cbf4c8960db0b59a25a3fb38a778e24a69a40.tar.gz podman-438cbf4c8960db0b59a25a3fb38a778e24a69a40.tar.bz2 podman-438cbf4c8960db0b59a25a3fb38a778e24a69a40.zip | |
Merge pull request #3813 from baude/nofds
do not activate sd_notify support when varlink
Diffstat (limited to 'libpod/oci_internal_linux.go')
| -rw-r--r-- | libpod/oci_internal_linux.go | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/libpod/oci_internal_linux.go b/libpod/oci_internal_linux.go index e2c73f5ed..6e4ee2cf2 100644 --- a/libpod/oci_internal_linux.go +++ b/libpod/oci_internal_linux.go @@ -247,10 +247,14 @@ func (r *OCIRuntime) configureConmonEnv(runtimeDir string) ([]string, []*os.File if notify, ok := os.LookupEnv("NOTIFY_SOCKET"); ok { env = append(env, fmt.Sprintf("NOTIFY_SOCKET=%s", notify)) } - if listenfds, ok := os.LookupEnv("LISTEN_FDS"); ok { - env = append(env, fmt.Sprintf("LISTEN_FDS=%s", listenfds), "LISTEN_PID=1") - fds := activation.Files(false) - extraFiles = append(extraFiles, fds...) + if !r.sdNotify { + if listenfds, ok := os.LookupEnv("LISTEN_FDS"); ok { + env = append(env, fmt.Sprintf("LISTEN_FDS=%s", listenfds), "LISTEN_PID=1") + fds := activation.Files(false) + extraFiles = append(extraFiles, fds...) + } + } else { + logrus.Debug("disabling SD notify") } return env, extraFiles, nil } |