diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2018-10-05 11:19:48 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-05 11:19:48 -0700 |
| commit | 260357cf8b8ddb8b85781a753b952b3392873c09 (patch) | |
| tree | 77a1be42f9f4b77f6d91e712ab4e7fe5ff321bbc /cmd/podman/shared/funcs.go | |
| parent | 550270364bb533f29742534ff31e15cbf54c57da (diff) | |
| parent | d4eca12cc12734f2b578e1b1967d69889c21c487 (diff) | |
| download | podman-260357cf8b8ddb8b85781a753b952b3392873c09.tar.gz podman-260357cf8b8ddb8b85781a753b952b3392873c09.tar.bz2 podman-260357cf8b8ddb8b85781a753b952b3392873c09.zip | |
Merge pull request #1594 from vrothberg/runlabel
runlabel: execute /proc/self/exe and avoid recursion
Diffstat (limited to 'cmd/podman/shared/funcs.go')
| -rw-r--r-- | cmd/podman/shared/funcs.go | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/cmd/podman/shared/funcs.go b/cmd/podman/shared/funcs.go index 5c401634c..21e7fe10d 100644 --- a/cmd/podman/shared/funcs.go +++ b/cmd/podman/shared/funcs.go @@ -15,9 +15,8 @@ func GenerateCommand(command, imageName, name string) []string { name = imageName } cmd := strings.Split(command, " ") - // Replace the first position of cmd with podman whether - // it is docker, /usr/bin/docker, or podman - newCommand = append(newCommand, "podman") + // Replace the first element of cmd with "/proc/self/exe" + newCommand = append(newCommand, "/proc/self/exe") for _, arg := range cmd[1:] { var newArg string switch arg { |