diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-08-20 22:08:25 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-20 22:08:25 +0200 |
| commit | 84180d99bc808795a1f91747436a42745ddececb (patch) | |
| tree | 52070eed2d7619f1a33c40ff826c681fb6dc6e7f /pkg | |
| parent | 386de7a1fbfef0c266e04f6471f9382a5d39a02f (diff) | |
| parent | 4e31c8136dffd2272e49715b83fba092621ffd2a (diff) | |
| download | podman-84180d99bc808795a1f91747436a42745ddececb.tar.gz podman-84180d99bc808795a1f91747436a42745ddececb.tar.bz2 podman-84180d99bc808795a1f91747436a42745ddececb.zip | |
Merge pull request #7353 from rhatdan/v2.0
Cleanup handling of podman mount/unmount
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/rootless/rootless_linux.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/pkg/rootless/rootless_linux.c b/pkg/rootless/rootless_linux.c index 2c6f7ae38..d2f217dd3 100644 --- a/pkg/rootless/rootless_linux.c +++ b/pkg/rootless/rootless_linux.c @@ -210,6 +210,13 @@ can_use_shortcut () ret = false; break; } + + if (argv[argc+1] != NULL && strcmp (argv[argc], "container") == 0 && + strcmp (argv[argc+1], "mount") == 0) + { + ret = false; + break; + } } free (argv[0]); |