diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-06-25 14:54:28 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-25 14:54:28 +0200 |
| commit | 21978c99088c04bcc847eb12f829876708c0b9e2 (patch) | |
| tree | dcd97566680acc7ae18d6690619baa53e25250d8 /libpod/oci_linux.go | |
| parent | d8b18a98791a49f5352d6a849cef7bff136cbb2c (diff) | |
| parent | 53c3720de940ace048ca888caa3ab50d82b2f178 (diff) | |
| download | podman-21978c99088c04bcc847eb12f829876708c0b9e2.tar.gz podman-21978c99088c04bcc847eb12f829876708c0b9e2.tar.bz2 podman-21978c99088c04bcc847eb12f829876708c0b9e2.zip | |
Merge pull request #3332 from rhatdan/cgroupmanager
Correctly identify the defaults for cgroup-manager
Diffstat (limited to 'libpod/oci_linux.go')
| -rw-r--r-- | libpod/oci_linux.go | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/libpod/oci_linux.go b/libpod/oci_linux.go index 6e84c0759..b7efa742a 100644 --- a/libpod/oci_linux.go +++ b/libpod/oci_linux.go @@ -296,7 +296,11 @@ func (r *OCIRuntime) createOCIContainer(ctr *Container, cgroupParent string, res cmd.Env = append(cmd.Env, fmt.Sprintf("XDG_RUNTIME_DIR=%s", runtimeDir)) cmd.Env = append(cmd.Env, fmt.Sprintf("_CONTAINERS_USERNS_CONFIGURED=%s", os.Getenv("_CONTAINERS_USERNS_CONFIGURED"))) cmd.Env = append(cmd.Env, fmt.Sprintf("_CONTAINERS_ROOTLESS_UID=%s", os.Getenv("_CONTAINERS_ROOTLESS_UID"))) - cmd.Env = append(cmd.Env, fmt.Sprintf("HOME=%s", os.Getenv("HOME"))) + home, err := homeDir() + if err != nil { + return err + } + cmd.Env = append(cmd.Env, fmt.Sprintf("HOME=%s", home)) if r.reservePorts && !ctr.config.NetMode.IsSlirp4netns() { ports, err := bindPorts(ctr.config.PortMappings) |