diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-07-29 04:30:01 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-29 04:30:01 -0400 |
| commit | 7f0c0941e84eece3d0e6cc62acc257e1ed33ef2a (patch) | |
| tree | 3a1fd54f215a73957c21d1b8817b082edd79e473 /pkg/rootless/rootless_linux.c | |
| parent | 539bb4c59208c9369cb034aa458b3ba89b8bdd3b (diff) | |
| parent | 6979d140f1c531fd32e885542be27407105ebf90 (diff) | |
| download | podman-7f0c0941e84eece3d0e6cc62acc257e1ed33ef2a.tar.gz podman-7f0c0941e84eece3d0e6cc62acc257e1ed33ef2a.tar.bz2 podman-7f0c0941e84eece3d0e6cc62acc257e1ed33ef2a.zip | |
Merge pull request #6851 from rhatdan/mount
Add podman image mount
Diffstat (limited to 'pkg/rootless/rootless_linux.c')
| -rw-r--r-- | pkg/rootless/rootless_linux.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pkg/rootless/rootless_linux.c b/pkg/rootless/rootless_linux.c index 8e0151496..d3e43e44d 100644 --- a/pkg/rootless/rootless_linux.c +++ b/pkg/rootless/rootless_linux.c @@ -211,7 +211,8 @@ can_use_shortcut () break; } - if (argv[argc+1] != NULL && strcmp (argv[argc], "container") == 0 && + if (argv[argc+1] != NULL && (strcmp (argv[argc], "container") == 0 || + strcmp (argv[argc], "image") == 0) && strcmp (argv[argc+1], "mount") == 0) { ret = false; |