diff options
| author | Giuseppe Scrivano <gscrivan@redhat.com> | 2020-08-03 09:38:10 +0200 |
|---|---|---|
| committer | Valentin Rothberg <rothberg@redhat.com> | 2020-08-11 12:15:24 +0200 |
| commit | 760a9077db10f0837986ae6b7e2d4003c6ad9662 (patch) | |
| tree | a6b09dc8e385d23bc90db41b6143c4266e3b39e4 /pkg/rootless/rootless_linux.c | |
| parent | a53b97beb3dfd3b95b205e35872344c5fadbb7c1 (diff) | |
| download | podman-760a9077db10f0837986ae6b7e2d4003c6ad9662.tar.gz podman-760a9077db10f0837986ae6b7e2d4003c6ad9662.tar.bz2 podman-760a9077db10f0837986ae6b7e2d4003c6ad9662.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>
Diffstat (limited to 'pkg/rootless/rootless_linux.c')
| -rw-r--r-- | pkg/rootless/rootless_linux.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkg/rootless/rootless_linux.c b/pkg/rootless/rootless_linux.c index 716db81dc..2c6f7ae38 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; |