summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--pkg/bindings/test/common_test.go6
-rw-r--r--pkg/rootless/rootless_linux.c3
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] == '-')