summaryrefslogtreecommitdiff
path: root/pkg
diff options
context:
space:
mode:
authorValentin Rothberg <rothberg@redhat.com>2020-03-03 15:29:13 +0100
committerValentin Rothberg <rothberg@redhat.com>2020-03-04 17:07:47 +0100
commit6d2d6898f8b31d9a3e15cf2d2923f098433d9a58 (patch)
treeaae76c12afe486cd1cc7ea21f92c244b13057f53 /pkg
parent34baea814ba6af58e7f7b65622fd0fb7b838fbf7 (diff)
downloadpodman-6d2d6898f8b31d9a3e15cf2d2923f098433d9a58.tar.gz
podman-6d2d6898f8b31d9a3e15cf2d2923f098433d9a58.tar.bz2
podman-6d2d6898f8b31d9a3e15cf2d2923f098433d9a58.zip
env: don't set "container" env
Leave setting the "container" variable to consumers of pkg/env. Podman is now hard-setting it to "podman" while "libpod" will set it internally to "libpod" if it's unset. Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
Diffstat (limited to 'pkg')
-rw-r--r--pkg/env/env.go7
1 files changed, 3 insertions, 4 deletions
diff --git a/pkg/env/env.go b/pkg/env/env.go
index 31ffab03c..d2f2efade 100644
--- a/pkg/env/env.go
+++ b/pkg/env/env.go
@@ -12,11 +12,10 @@ import (
"github.com/pkg/errors"
)
-// DefaultEnvVariables set $PATH, $TERM and $container.
+// DefaultEnvVariables sets $PATH and $TERM.
var DefaultEnvVariables = map[string]string{
- "PATH": "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin",
- "TERM": "xterm",
- "container": "podman",
+ "PATH": "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin",
+ "TERM": "xterm",
}
const whiteSpaces = " \t"