diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-11-05 12:08:15 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-05 12:08:15 +0100 |
| commit | cdc50e9d195f8081d3a5dc69cc65ddd3f050497c (patch) | |
| tree | ddbaf19c15fc9356dd1cc07a4308651af7616fd1 /libpod/oci_conmon_exec_linux.go | |
| parent | 3ef721fa1f406d95fdc16b2ba46bf865b4a0433d (diff) | |
| parent | 5a032acff6e6906cfb5533ec135f177b696d7154 (diff) | |
| download | podman-cdc50e9d195f8081d3a5dc69cc65ddd3f050497c.tar.gz podman-cdc50e9d195f8081d3a5dc69cc65ddd3f050497c.tar.bz2 podman-cdc50e9d195f8081d3a5dc69cc65ddd3f050497c.zip | |
Merge pull request #8205 from rhatdan/home
Only use container/storage/pkg/unshare.HomeDir()
Diffstat (limited to 'libpod/oci_conmon_exec_linux.go')
| -rw-r--r-- | libpod/oci_conmon_exec_linux.go | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/libpod/oci_conmon_exec_linux.go b/libpod/oci_conmon_exec_linux.go index 8651c1dc5..7068bf87a 100644 --- a/libpod/oci_conmon_exec_linux.go +++ b/libpod/oci_conmon_exec_linux.go @@ -444,10 +444,7 @@ func (r *ConmonOCIRuntime) startExec(c *Container, sessionID string, options *Ex // } // } - conmonEnv, extraFiles, err := r.configureConmonEnv(c, runtimeDir) - if err != nil { - return nil, nil, err - } + conmonEnv, extraFiles := r.configureConmonEnv(c, runtimeDir) var filesToClose []*os.File if options.PreserveFDs > 0 { |