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

rootless: system service joins immediately the namespaces
2020-08-04 12:17:34 +02:00 · 2020-08-04 12:17:34 +02:00 · 861702e026
parent 919e5d4d6e 8df7ab24b0
commit 861702e026
1 changed files with 1 additions and 1 deletions
--- 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;