summaryrefslogtreecommitdiff
path: root/pkg
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-03-04 13:26:48 -0500
committerGitHub <noreply@github.com>2020-03-04 13:26:48 -0500
commit797da2a57b43d1190dd1fb6ec78dcc9ec76c3bd3 (patch)
treead2c3bebdbca7587d9a7d58fdba03e91b2973def /pkg
parent4d012cb6db61df28b455f0a906e1e73ac0055cc0 (diff)
parent6d2d6898f8b31d9a3e15cf2d2923f098433d9a58 (diff)
downloadpodman-797da2a57b43d1190dd1fb6ec78dcc9ec76c3bd3.tar.gz
podman-797da2a57b43d1190dd1fb6ec78dcc9ec76c3bd3.tar.bz2
podman-797da2a57b43d1190dd1fb6ec78dcc9ec76c3bd3.zip
Merge pull request #5381 from vrothberg/ENVFIX
env: set "container" to current binary
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 9c0ee79db..c6a1a0d28 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"