diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-07-06 17:15:26 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-06 17:15:26 -0400 |
| commit | 1a93857acc4ee1e5a9213e2c22f12802d84cd277 (patch) | |
| tree | d3f8c923e0750fa4aa5ed423dca52640a8ff187c /libpod/oci_conmon_exec_linux.go | |
| parent | b1cc781c68964dff3ee4a00ef7ce71f56ae69e7c (diff) | |
| parent | 10ad46eb7377ff504a65783a7a604b248b50f20a (diff) | |
| download | podman-1a93857acc4ee1e5a9213e2c22f12802d84cd277.tar.gz podman-1a93857acc4ee1e5a9213e2c22f12802d84cd277.tar.bz2 podman-1a93857acc4ee1e5a9213e2c22f12802d84cd277.zip | |
Merge pull request #6693 from goochjj/libpod-sd-notify-cmdline
Implement --sdnotify cmdline option to control sd-notify behavior
Diffstat (limited to 'libpod/oci_conmon_exec_linux.go')
| -rw-r--r-- | libpod/oci_conmon_exec_linux.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libpod/oci_conmon_exec_linux.go b/libpod/oci_conmon_exec_linux.go index 1a6fe827b..4196bdcaf 100644 --- a/libpod/oci_conmon_exec_linux.go +++ b/libpod/oci_conmon_exec_linux.go @@ -444,7 +444,7 @@ func (r *ConmonOCIRuntime) startExec(c *Container, sessionID string, options *Ex // } // } - conmonEnv, extraFiles, err := r.configureConmonEnv(runtimeDir) + conmonEnv, extraFiles, err := r.configureConmonEnv(c, runtimeDir) if err != nil { return nil, nil, err } |