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 /pkg/rootless/rootless_linux.c | |
| 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 '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; |