5 files changed, 7 insertions, 18 deletions
diff --git a/cmd/podman/commands.go b/cmd/podman/commands.go
index 14451d944..3a409f503 100644
--- a/cmd/podman/commands.go
+++ b/cmd/podman/commands.go
@@ -39,13 +39,11 @@ func getImageSubCommands() []*cobra.Command {
 func getContainerSubCommands() []*cobra.Command {
 
 	return []*cobra.Command{
-		_checkpointCommand,
 		_cleanupCommand,
 		_commitCommand,
 		_execCommand,
 		_mountCommand,
 		_refreshCommand,
-		_restoreCommand,
 		_runlabelCommand,
 		_statsCommand,
 		_umountCommand,
diff --git a/cmd/podman/container.go b/cmd/podman/container.go
index bbf01d1f8..530175a55 100644
--- a/cmd/podman/container.go
+++ b/cmd/podman/container.go
@@ -51,6 +51,7 @@ var (
 	// Commands that are universally implemented.
 	containerCommands = []*cobra.Command{
 		_attachCommand,
+		_checkpointCommand,
 		_containerExistsCommand,
 		_contInspectSubCommand,
 		_diffCommand,
@@ -64,6 +65,7 @@ var (
 		_portCommand,
 		_pruneContainersCommand,
 		_restartCommand,
+		_restoreCommand,
 		_runCommand,
 		_rmCommand,
 		_startCommand,
diff --git a/cmd/podman/main_remote.go b/cmd/podman/main_remote.go
index a3335050a..753730b56 100644
--- a/cmd/podman/main_remote.go
+++ b/cmd/podman/main_remote.go
@@ -3,10 +3,6 @@
 package main
 
 import (
-	"os"
-
-	"github.com/containers/libpod/pkg/rootless"
-	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 )
 
@@ -29,16 +25,6 @@ func profileOff(cmd *cobra.Command) error {
 }
 
 func setupRootless(cmd *cobra.Command, args []string) error {
-	if rootless.IsRootless() {
-		became, ret, err := rootless.BecomeRootInUserNS()
-		if err != nil {
-			logrus.Errorf(err.Error())
-			os.Exit(1)
-		}
-		if became {
-			os.Exit(ret)
-		}
-	}
 	return nil
 }
 
diff --git a/cmd/podman/ps.go b/cmd/podman/ps.go
index 623f17050..eb5181126 100644
--- a/cmd/podman/ps.go
+++ b/cmd/podman/ps.go
@@ -497,7 +497,7 @@ func psDisplay(c *cliconfig.PsValues, runtime *adapter.LocalRuntime) error {
 
 		} else {
 			// Print namespace information
-			ns := shared.GetNamespaces(container.Pid)
+			ns := runtime.GetNamespaces(container)
 			fmt.Fprintf(w, "\n%s\t%s\t%d\t%s\t%s\t%s\t%s\t%s\t%s\t%s", container.ID, container.Names, container.Pid, ns.Cgroup, ns.IPC, ns.MNT, ns.NET, ns.PIDNS, ns.User, ns.UTS)
 		}
 
diff --git a/cmd/podman/varlink/io.podman.varlink b/cmd/podman/varlink/io.podman.varlink
index ace81646c..faaecdb6b 100644
--- a/cmd/podman/varlink/io.podman.varlink
+++ b/cmd/podman/varlink/io.podman.varlink
@@ -1254,4 +1254,7 @@ error ErrorOccurred (reason: string)
 error RuntimeError (reason: string)
 
 # The Podman endpoint requires that you use a streaming connection.
-error WantsMoreRequired (reason: string)
-\ No newline at end of file
+error WantsMoreRequired (reason: string)
+
+# Container is already stopped
+error ErrCtrStopped (id: string)