summaryrefslogtreecommitdiff
path: root/pkg
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-07-28 14:03:22 +0200
committerGitHub <noreply@github.com>2020-07-28 14:03:22 +0200
commit91c92d10fc64af7e7813ba46f8eae8a8e7db44de (patch)
tree8fa6bdb3d536f00f98a845cfa043335152cb48af /pkg
parentd463715ce75254a7a52e902b36f91431197ab4a8 (diff)
parent8f7ed50cb20c04bbbb7c4907a183c07912d4bffb (diff)
downloadpodman-91c92d10fc64af7e7813ba46f8eae8a8e7db44de.tar.gz
podman-91c92d10fc64af7e7813ba46f8eae8a8e7db44de.tar.bz2
podman-91c92d10fc64af7e7813ba46f8eae8a8e7db44de.zip
Merge pull request #7085 from rhatdan/cmount
Cleanup handling of podman mount/unmount
Diffstat (limited to 'pkg')
-rw-r--r--pkg/rootless/rootless_linux.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/pkg/rootless/rootless_linux.c b/pkg/rootless/rootless_linux.c
index 716db81dc..8e0151496 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]);