diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-09-30 08:35:07 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-30 08:35:07 -0400 |
| commit | d8bdbf5b66c860a73f5d4e301535c0ee40d8d719 (patch) | |
| tree | ee5e4c6705632064406f49147d2e5fb51947d300 /pkg/rootless/rootless_linux.c | |
| parent | f0ae84f5120f7ec8d2fc16c6ae9e52725b5d4958 (diff) | |
| parent | 855746cc9258b85d390d68cd3c61ca0588dd0f8f (diff) | |
| download | podman-d8bdbf5b66c860a73f5d4e301535c0ee40d8d719.tar.gz podman-d8bdbf5b66c860a73f5d4e301535c0ee40d8d719.tar.bz2 podman-d8bdbf5b66c860a73f5d4e301535c0ee40d8d719.zip | |
Merge pull request #11792 from mheon/340_final
Backports + release notes for v3.4.0 final
Diffstat (limited to 'pkg/rootless/rootless_linux.c')
| -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)) { |