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>

1 files changed, 13 insertions, 5 deletions

diff --git a/cmd/podman/main.go b/cmd/podman/main.go
index 5f740a006..4bdb020af 100644
--- a/cmd/podman/main.go
+++ b/cmd/podman/main.go
@@ -39,13 +39,21 @@ func main() {
 		for _, m := range c.Mode {
 			if cfg.EngineMode == m {
 				// Command cannot be run rootless
-				_, found := c.Command.Annotations[registry.ParentNSRequired]
-				if rootless.IsRootless() && found {
-					c.Command.RunE = func(cmd *cobra.Command, args []string) error {
-						return fmt.Errorf("cannot run command %q in rootless mode", cmd.CommandPath())
+				_, found := c.Command.Annotations[registry.UnshareNSRequired]
+				if found {
+					if rootless.IsRootless() && found && os.Getuid() != 0 {
+						c.Command.RunE = func(cmd *cobra.Command, args []string) error {
+							return fmt.Errorf("cannot run command %q in rootless mode, must execute `podman unshare` first", cmd.CommandPath())
+						}
+					}
+				} else {
+					_, found = c.Command.Annotations[registry.ParentNSRequired]
+					if rootless.IsRootless() && found {
+						c.Command.RunE = func(cmd *cobra.Command, args []string) error {
+							return fmt.Errorf("cannot run command %q in rootless mode", cmd.CommandPath())
+						}
 					}
 				}
-
 				parent := rootCmd
 				if c.Parent != nil {
 					parent = c.Parent