2 files changed, 34 insertions, 19 deletions
diff --git a/cmd/podman/main.go b/cmd/podman/main.go
index 204344695..dd8b61408 100644
--- a/cmd/podman/main.go
+++ b/cmd/podman/main.go
@@ -67,25 +67,26 @@ var cmdsNotRequiringRootless = map[*cobra.Command]bool{
 	_exportCommand:  true,
 	//// `info` must be executed in an user namespace.
 	//// If this change, please also update libpod.refreshRootless()
-	_loginCommand:    true,
-	_logoutCommand:   true,
-	_mountCommand:    true,
-	_killCommand:     true,
-	_pauseCommand:    true,
-	_podRmCommand:    true,
-	_podKillCommand:  true,
-	_podStatsCommand: true,
-	_podStopCommand:  true,
-	_podTopCommand:   true,
-	_restartCommand:  true,
-	&_psCommand:      true,
-	_rmCommand:       true,
-	_runCommand:      true,
-	_unpauseCommand:  true,
-	_searchCommand:   true,
-	_statsCommand:    true,
-	_stopCommand:     true,
-	_topCommand:      true,
+	_loginCommand:      true,
+	_logoutCommand:     true,
+	_mountCommand:      true,
+	_killCommand:       true,
+	_pauseCommand:      true,
+	_podRmCommand:      true,
+	_podKillCommand:    true,
+	_podRestartCommand: true,
+	_podStatsCommand:   true,
+	_podStopCommand:    true,
+	_podTopCommand:     true,
+	_restartCommand:    true,
+	&_psCommand:        true,
+	_rmCommand:         true,
+	_runCommand:        true,
+	_unpauseCommand:    true,
+	_searchCommand:     true,
+	_statsCommand:      true,
+	_stopCommand:       true,
+	_topCommand:        true,
 }
 
 var rootCmd = &cobra.Command{
diff --git a/cmd/podman/pod_restart.go b/cmd/podman/pod_restart.go
index 0765b98db..9c8d28424 100644
--- a/cmd/podman/pod_restart.go
+++ b/cmd/podman/pod_restart.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 podRestartCmd(c *cliconfig.PodRestartValues) error {
 	var lastError 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
+		}
+	}
+
 	restartIDs, conErrors, restartErrors := runtime.RestartPods(getContext(), c)
 
 	for _, p := range restartIDs {