Merge pull request #7085 from rhatdan/cmount

Cleanup handling of podman mount/unmount

1 files changed, 13 insertions, 5 deletions

diff --git a/cmd/podman/main.go b/cmd/podman/main.go
index f46f74547..d0e89c2f5 100644
--- a/cmd/podman/main.go
+++ b/cmd/podman/main.go
@@ -40,13 +40,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