Merge pull request #11752 from Luap99/machine-no-userns

podman machine: do not join userns
2025-06-23 18:59:30 +08:00 · 2021-09-27 05:43:10 -04:00
parent e19a09c3df c668ca8597
commit 869cb9a654
1 changed files with 1 additions and 0 deletions
--- a/pkg/rootless/rootless_linux.c
+++ b/pkg/rootless/rootless_linux.c
@ -212,6 +212,7 @@ can_use_shortcut ()
        continue;

      if (strcmp (argv[argc], "mount") == 0
+          || strcmp (argv[argc], "machine") == 0
          || strcmp (argv[argc], "search") == 0
          || (strcmp (argv[argc], "system") == 0 && argv[argc+1] && strcmp (argv[argc+1], "service") != 0))
        {