4 files changed, 77 insertions, 0 deletions

diff --git a/cmd/podman/main.go b/cmd/podman/main.go
index c347a922d..1c6217dac 100644
--- a/cmd/podman/main.go
+++ b/cmd/podman/main.go
@@ -70,8 +70,10 @@ var cmdsNotRequiringRootless = map[*cobra.Command]bool{
 	_mountCommand:    true,
 	_killCommand:     true,
 	_pauseCommand:    true,
+	_podRmCommand:    true,
 	_podKillCommand:  true,
 	_podStatsCommand: true,
+	_podStopCommand:  true,
 	_restartCommand:  true,
 	_rmCommand:       true,
 	_runCommand:      true,
diff --git a/cmd/podman/pod.go b/cmd/podman/pod.go
index 2d9bca21d..9a9c7a702 100644
--- a/cmd/podman/pod.go
+++ b/cmd/podman/pod.go
@@ -1,7 +1,12 @@
 package main
 
 import (
+	"os"
+
 	"github.com/containers/libpod/cmd/podman/cliconfig"
+	"github.com/containers/libpod/pkg/adapter"
+	"github.com/containers/libpod/pkg/rootless"
+	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 )
 
@@ -34,6 +39,48 @@ var podSubCommands = []*cobra.Command{
 	_podUnpauseCommand,
 }
 
+func joinPodNS(runtime *adapter.LocalRuntime, all, latest bool, inputArgs []string) ([]string, bool, bool, error) {
+	if rootless.IsRootless() {
+		if os.Geteuid() == 0 {
+			return []string{rootless.Argument()}, false, false, nil
+		} else {
+			var err error
+			var pods []*adapter.Pod
+			if all {
+				pods, err = runtime.GetAllPods()
+				if err != nil {
+					return nil, false, false, errors.Wrapf(err, "unable to get pods")
+				}
+			} else if latest {
+				pod, err := runtime.GetLatestPod()
+				if err != nil {
+					return nil, false, false, errors.Wrapf(err, "unable to get latest pod")
+				}
+				pods = append(pods, pod)
+			} else {
+				for _, i := range inputArgs {
+					pod, err := runtime.LookupPod(i)
+					if err != nil {
+						return nil, false, false, errors.Wrapf(err, "unable to lookup pod %s", i)
+					}
+					pods = append(pods, pod)
+				}
+			}
+			for _, p := range pods {
+				_, ret, err := runtime.JoinOrCreateRootlessPod(p)
+				if err != nil {
+					return nil, false, false, err
+				}
+				if ret != 0 {
+					os.Exit(ret)
+				}
+			}
+			os.Exit(0)
+		}
+	}
+	return inputArgs, all, latest, nil
+}
+
 func init() {
 	podCommand.AddCommand(podSubCommands...)
 	podCommand.SetHelpTemplate(HelpTemplate())
diff --git a/cmd/podman/pod_rm.go b/cmd/podman/pod_rm.go
index a40992818..735676f8a 100644
--- a/cmd/podman/pod_rm.go
+++ b/cmd/podman/pod_rm.go
@@ -2,9 +2,11 @@ package main
 
 import (
 	"fmt"
+	"os"
 
 	"github.com/containers/libpod/cmd/podman/cliconfig"
 	"github.com/containers/libpod/pkg/adapter"
+	"github.com/containers/libpod/pkg/rootless"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
@@ -46,11 +48,23 @@ func init() {
 
 // podRmCmd deletes pods
 func podRmCmd(c *cliconfig.PodRmValues) error {
+	if os.Geteuid() != 0 {
+		rootless.SetSkipStorageSetup(true)
+	}
 	runtime, err := adapter.GetRuntime(&c.PodmanCommand)
 	if err != nil {
 		return errors.Wrapf(err, "could not get runtime")
 	}
 	defer runtime.Shutdown(false)
+
+	if rootless.IsRootless() {
+		var err error
+		c.InputArgs, c.All, c.Latest, err = joinPodNS(runtime, c.All, c.Latest, c.InputArgs)
+		if err != nil {
+			return err
+		}
+	}
+
 	podRmIds, podRmErrors := runtime.RemovePods(getContext(), c)
 	for _, p := range podRmIds {
 		fmt.Println(p)
diff --git a/cmd/podman/pod_stop.go b/cmd/podman/pod_stop.go
index f1b0ac51f..754a3a7db 100644
--- a/cmd/podman/pod_stop.go
+++ b/cmd/podman/pod_stop.go
@@ -2,9 +2,11 @@ package main
 
 import (
 	"fmt"
+	"os"
 
 	"github.com/containers/libpod/cmd/podman/cliconfig"
 	"github.com/containers/libpod/pkg/adapter"
+	"github.com/containers/libpod/pkg/rootless"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
@@ -46,12 +48,24 @@ func init() {
 }
 
 func podStopCmd(c *cliconfig.PodStopValues) error {
+	if os.Geteuid() != 0 {
+		rootless.SetSkipStorageSetup(true)
+	}
+
 	runtime, err := adapter.GetRuntime(&c.PodmanCommand)
 	if err != nil {
 		return errors.Wrapf(err, "could not get runtime")
 	}
 	defer runtime.Shutdown(false)
 
+	if rootless.IsRootless() {
+		var err error
+		c.InputArgs, c.All, c.Latest, err = joinPodNS(runtime, c.All, c.Latest, c.InputArgs)
+		if err != nil {
+			return err
+		}
+	}
+
 	podStopIds, podStopErrors := runtime.StopPods(getContext(), c)
 	for _, p := range podStopIds {
 		fmt.Println(p)