diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-08-04 12:17:34 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-04 12:17:34 +0200 |
| commit | 861702e0263927f2b063033bc480c8927b1f7e6b (patch) | |
| tree | 56a7a30bf30f379b98b6ceecd3bc18e83ed4faa3 /pkg | |
| parent | 919e5d4d6e6f4a54fd5b02c3f1352b00b6494936 (diff) | |
| parent | 8df7ab24b074c24b0312d9943c8c14331210b357 (diff) | |
| download | podman-861702e0263927f2b063033bc480c8927b1f7e6b.tar.gz podman-861702e0263927f2b063033bc480c8927b1f7e6b.tar.bz2 podman-861702e0263927f2b063033bc480c8927b1f7e6b.zip | |
Merge pull request #7192 from giuseppe/system-service-join-ns-immediately
rootless: system service joins immediately the namespaces
Diffstat (limited to 'pkg')
| -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 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; |