diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-09-27 05:43:10 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-27 05:43:10 -0400 |
| commit | 869cb9a65413cc99bf8ed0e158c0e2f7b0df513a (patch) | |
| tree | 1d525552440ec3cf780e20a3119fa96d79c2cdcc | |
| parent | e19a09c3dfb90e12078e0af4ca2cfc45677c6d68 (diff) | |
| parent | c668ca8597cc923413e047f4164147a2fb0fe92d (diff) | |
| download | podman-869cb9a65413cc99bf8ed0e158c0e2f7b0df513a.tar.gz podman-869cb9a65413cc99bf8ed0e158c0e2f7b0df513a.tar.bz2 podman-869cb9a65413cc99bf8ed0e158c0e2f7b0df513a.zip | |
Merge pull request #11752 from Luap99/machine-no-userns
podman machine: do not join userns
| -rw-r--r-- | pkg/rootless/rootless_linux.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/pkg/rootless/rootless_linux.c b/pkg/rootless/rootless_linux.c index 4d8443fcb..6ce4b1e29 100644 --- 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)) { |