diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-03-28 17:00:31 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-28 17:00:31 -0700 |
| commit | fdf979a7917a497322b23354778bd32bbd9b05f5 (patch) | |
| tree | 2483cd9b10edf69d529eb9d9cea2fb5dbbeca8d7 /libpod/oci.go | |
| parent | df5b6e29a66fa78f50fed20b273873fd5522f37e (diff) | |
| parent | ce0ca0d459f15d96154ef1c7c9b94aafe22904fb (diff) | |
| download | podman-fdf979a7917a497322b23354778bd32bbd9b05f5.tar.gz podman-fdf979a7917a497322b23354778bd32bbd9b05f5.tar.bz2 podman-fdf979a7917a497322b23354778bd32bbd9b05f5.zip | |
Merge pull request #2786 from giuseppe/change-rootless-env-names
rootless: change env prefix
Diffstat (limited to 'libpod/oci.go')
| -rw-r--r-- | libpod/oci.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libpod/oci.go b/libpod/oci.go index 69cff6d3c..b25175b9d 100644 --- a/libpod/oci.go +++ b/libpod/oci.go @@ -325,8 +325,8 @@ func (r *OCIRuntime) createOCIContainer(ctr *Container, cgroupParent string, res cmd.Env = append(r.conmonEnv, fmt.Sprintf("_OCI_SYNCPIPE=%d", 3)) cmd.Env = append(cmd.Env, fmt.Sprintf("_OCI_STARTPIPE=%d", 4)) cmd.Env = append(cmd.Env, fmt.Sprintf("XDG_RUNTIME_DIR=%s", runtimeDir)) - cmd.Env = append(cmd.Env, fmt.Sprintf("_LIBPOD_USERNS_CONFIGURED=%s", os.Getenv("_LIBPOD_USERNS_CONFIGURED"))) - cmd.Env = append(cmd.Env, fmt.Sprintf("_LIBPOD_ROOTLESS_UID=%s", os.Getenv("_LIBPOD_ROOTLESS_UID"))) + 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"))) if r.reservePorts && !ctr.config.NetMode.IsSlirp4netns() { |