diff options
| author | Giuseppe Scrivano <gscrivan@redhat.com> | 2019-03-28 09:20:25 +0100 |
|---|---|---|
| committer | Giuseppe Scrivano <gscrivan@redhat.com> | 2019-03-28 17:08:20 +0100 |
| commit | ce0ca0d459f15d96154ef1c7c9b94aafe22904fb (patch) | |
| tree | a2eb4328e98fabe29825b43062028916892db0b9 /libpod | |
| parent | 850326cc192444d1c5cfd8ba6e1015f653b41e73 (diff) | |
| download | podman-ce0ca0d459f15d96154ef1c7c9b94aafe22904fb.tar.gz podman-ce0ca0d459f15d96154ef1c7c9b94aafe22904fb.tar.bz2 podman-ce0ca0d459f15d96154ef1c7c9b94aafe22904fb.zip | |
rootless: change env prefix
from _LIBPOD to _CONTAINERS. The same change was done in buildah
unshare.
This is necessary for podman to detect we are running in a rootless
environment and work properly from a "buildah unshare" session.
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
Diffstat (limited to 'libpod')
| -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() { |