From f8067d70b00dbc8caeb78a49fb695a4bfde157cd Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Wed, 29 Jan 2020 22:06:32 +0100 Subject: test: honor TEMPDIR variable Signed-off-by: Giuseppe Scrivano --- pkg/bindings/test/common_test.go | 6 ++++++ 1 file changed, 6 insertions(+) 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) -- cgit v1.2.3-54-g00ecf From 1d9537e242798f94d8062819d5763b656dcc5acd Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Wed, 29 Jan 2020 22:06:49 +0100 Subject: rootless: enable shortcut only for podman disable joining automatically the user namespace if the process is not podman. Signed-off-by: Giuseppe Scrivano --- pkg/rootless/rootless_linux.c | 3 +++ 1 file changed, 3 insertions(+) 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] == '-') -- cgit v1.2.3-54-g00ecf