diff options
author | Paul Holzinger <pholzing@redhat.com> | 2021-09-27 10:15:18 +0200 |
---|---|---|
committer | Paul Holzinger <pholzing@redhat.com> | 2021-09-27 10:18:23 +0200 |
commit | c668ca8597cc923413e047f4164147a2fb0fe92d (patch) | |
tree | 1d525552440ec3cf780e20a3119fa96d79c2cdcc /pkg | |
parent | e19a09c3dfb90e12078e0af4ca2cfc45677c6d68 (diff) | |
download | podman-c668ca8597cc923413e047f4164147a2fb0fe92d.tar.gz podman-c668ca8597cc923413e047f4164147a2fb0fe92d.tar.bz2 podman-c668ca8597cc923413e047f4164147a2fb0fe92d.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')
-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)) { |