summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGiuseppe Scrivano <gscrivan@redhat.com>2020-08-03 09:38:10 +0200
committerGiuseppe Scrivano <gscrivan@redhat.com>2020-08-03 22:08:17 +0200
commit8df7ab24b074c24b0312d9943c8c14331210b357 (patch)
tree189d2a65974f94e26cf4e5c0700a83a62c0286bb
parentbfd34542f463b7ea59b9560516b3b3d66674eefe (diff)
downloadpodman-8df7ab24b074c24b0312d9943c8c14331210b357.tar.gz
podman-8df7ab24b074c24b0312d9943c8c14331210b357.tar.bz2
podman-8df7ab24b074c24b0312d9943c8c14331210b357.zip
rootless: system service joins immediately the namespaces
when there is a pause process running, let the "system service" podman instance join immediately the existing namespaces. Closes: https://github.com/containers/podman/issues/7180 Closes: https://github.com/containers/podman/issues/6660 Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
-rw-r--r--pkg/rootless/rootless_linux.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/pkg/rootless/rootless_linux.c b/pkg/rootless/rootless_linux.c
index eaf2d4551..0223c35ee 100644
--- a/pkg/rootless/rootless_linux.c
+++ b/pkg/rootless/rootless_linux.c
@@ -205,7 +205,7 @@ can_use_shortcut ()
if (strcmp (argv[argc], "mount") == 0
|| strcmp (argv[argc], "search") == 0
- || strcmp (argv[argc], "system") == 0)
+ || (strcmp (argv[argc], "system") == 0 && argv[argc+1] && strcmp (argv[argc+1], "service") != 0))
{
ret = false;
break;