diff options
| author | Paul Holzinger <pholzing@redhat.com> | 2021-09-27 10:15:18 +0200 |
|---|---|---|
| committer | Matthew Heon <matthew.heon@pm.me> | 2021-09-29 16:39:29 -0400 |
| commit | 7395459c761a1bc03448d2c81a887014d04da9d1 (patch) | |
| tree | f1dedab50ba4b6d3779b4075b901503ac3301efe /pkg/rootless | |
| parent | 5e9aa13dc03e022db91135be2cb001c35eef0d08 (diff) | |
| download | podman-7395459c761a1bc03448d2c81a887014d04da9d1.tar.gz podman-7395459c761a1bc03448d2c81a887014d04da9d1.tar.bz2 podman-7395459c761a1bc03448d2c81a887014d04da9d1.zip | |
podman machine: do not join userns
The go logic already prevents podman from joining the userns for machine
commands but the c shortcut code did not.
[NO TESTS NEEDED]
Fixes #11731
Signed-off-by: Paul Holzinger <pholzing@redhat.com>
Diffstat (limited to 'pkg/rootless')
| -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)) { |