diff options
author | Daniel J Walsh <dwalsh@redhat.com> | 2020-07-09 14:53:46 -0400 |
---|---|---|
committer | Daniel J Walsh <dwalsh@redhat.com> | 2020-07-27 16:53:02 -0400 |
commit | 8f7ed50cb20c04bbbb7c4907a183c07912d4bffb (patch) | |
tree | 14001f06bc0a278d0e34c6e7312ffd08c3afe526 /pkg/rootless | |
parent | 2b7bc9b101887a789a9fc0282d448efad824404f (diff) | |
download | podman-8f7ed50cb20c04bbbb7c4907a183c07912d4bffb.tar.gz podman-8f7ed50cb20c04bbbb7c4907a183c07912d4bffb.tar.bz2 podman-8f7ed50cb20c04bbbb7c4907a183c07912d4bffb.zip |
Cleanup handling of podman mount/unmount
We should default to the user name unmount rather then the internal
name of umount.
Also User namespace was not being handled correctly. We want to inform
the user that if they do a mount when in rootless mode that they have
to be first in the podman unshare state.
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
Diffstat (limited to 'pkg/rootless')
-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 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]); |