Merge pull request #7192 from giuseppe/system-service-join-ns-immedia…

…tely rootless: system service joins immediately the namespaces
containers · Aug 4, 2020 · 861702e · 861702e
2 parents 919e5d4 + 8df7ab2
commit 861702e
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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;