Skip to content

Commit

Permalink
podman machine: do not join userns
Browse files Browse the repository at this point in the history
The go logic already prevents podman from joining the userns for machine
commands but the c shortcut code did not.

[NO TESTS NEEDED]

Fixes containers#11731

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
  • Loading branch information
Luap99 authored and mheon committed Sep 29, 2021
1 parent 5e9aa13 commit 7395459
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions pkg/rootless/rootless_linux.c
Original file line number Diff line number Diff line change
Expand Up @@ -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))
{
Expand Down

0 comments on commit 7395459

Please sign in to comment.