diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-01-30 15:24:51 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-30 15:24:51 -0800 |
| commit | 4f96b17ef58f83e58af2a8016e1acc7f68a959c7 (patch) | |
| tree | a601c54632f624ce4b7d846b8c78975bce98a844 | |
| parent | a3e14c87bb15c551d58d5b4f66cdfa5b900d50f5 (diff) | |
| parent | 1d9537e242798f94d8062819d5763b656dcc5acd (diff) | |
| download | podman-4f96b17ef58f83e58af2a8016e1acc7f68a959c7.tar.gz podman-4f96b17ef58f83e58af2a8016e1acc7f68a959c7.tar.bz2 podman-4f96b17ef58f83e58af2a8016e1acc7f68a959c7.zip | |
Merge pull request #5020 from baude/bindingtestrootless
Bindingtestrootless
| -rw-r--r-- | pkg/bindings/test/common_test.go | 6 | ||||
| -rw-r--r-- | pkg/rootless/rootless_linux.c | 3 |
2 files changed, 9 insertions, 0 deletions
diff --git a/pkg/bindings/test/common_test.go b/pkg/bindings/test/common_test.go index e3e66c89f..15783041f 100644 --- a/pkg/bindings/test/common_test.go +++ b/pkg/bindings/test/common_test.go @@ -62,6 +62,12 @@ func (b *bindingTest) runPodman(command []string) *gexec.Session { } else { cmd = append(cmd, "--runroot", b.runRoot) } + val, ok = os.LookupEnv("TEMPDIR") + if ok { + cmd = append(cmd, "--tmpdir", val) + } else { + cmd = append(cmd, "--tmpdir", b.tempDirPath) + } val, ok = os.LookupEnv("STORAGE_DRIVER") if ok { cmd = append(cmd, "--storage-driver", val) diff --git a/pkg/rootless/rootless_linux.c b/pkg/rootless/rootless_linux.c index 041a161dc..83f4f3254 100644 --- a/pkg/rootless/rootless_linux.c +++ b/pkg/rootless/rootless_linux.c @@ -200,6 +200,9 @@ can_use_shortcut () if (argv == NULL) return false; + if (strstr (argv[0], "podman") == NULL) + return false; + for (argc = 0; argv[argc]; argc++) { if (argc == 0 || argv[argc][0] == '-') |