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 /pkg/rootless/rootless_linux.c | |
| 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 'pkg/rootless/rootless_linux.c')
| -rw-r--r-- | pkg/rootless/rootless_linux.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pkg/rootless/rootless_linux.c b/pkg/rootless/rootless_linux.c index ff39e9e77..2e2c3acac 100644 --- a/pkg/rootless/rootless_linux.c +++ b/pkg/rootless/rootless_linux.c @@ -136,8 +136,8 @@ reexec_userns_join (int userns, int mountns) if (pid) return pid; - setenv ("_LIBPOD_USERNS_CONFIGURED", "init", 1); - setenv ("_LIBPOD_ROOTLESS_UID", uid, 1); + setenv ("_CONTAINERS_USERNS_CONFIGURED", "init", 1); + setenv ("_CONTAINERS_ROOTLESS_UID", uid, 1); if (setns (userns, 0) < 0) { @@ -265,8 +265,8 @@ reexec_in_user_namespace (int ready) setenv("LISTEN_PID", s, true); } - setenv ("_LIBPOD_USERNS_CONFIGURED", "init", 1); - setenv ("_LIBPOD_ROOTLESS_UID", uid, 1); + setenv ("_CONTAINERS_USERNS_CONFIGURED", "init", 1); + setenv ("_CONTAINERS_ROOTLESS_UID", uid, 1); do ret = read (ready, &b, 1) < 0; |