From ff4c7a068add2b0a910d2e7f3d442a5c93586e98 Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Tue, 28 Aug 2018 08:38:00 +0200 Subject: rootless, stop: do not create a new userns Signed-off-by: Giuseppe Scrivano Closes: #1360 Approved by: vrothberg --- cmd/podman/main.go | 2 +- cmd/podman/stop.go | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'cmd/podman') diff --git a/cmd/podman/main.go b/cmd/podman/main.go index 1734a2c9e..4edc86361 100644 --- a/cmd/podman/main.go +++ b/cmd/podman/main.go @@ -25,7 +25,7 @@ var ( exitCode = 125 ) -var cmdsNotRequiringRootless = map[string]bool{"help": true, "version": true, "exec": true} +var cmdsNotRequiringRootless = map[string]bool{"help": true, "version": true, "exec": true, "stop": true} func main() { debug := false diff --git a/cmd/podman/stop.go b/cmd/podman/stop.go index d1fae56dd..c8f03a748 100644 --- a/cmd/podman/stop.go +++ b/cmd/podman/stop.go @@ -6,6 +6,7 @@ import ( "github.com/containers/libpod/cmd/podman/libpodruntime" "github.com/containers/libpod/libpod" + "github.com/containers/libpod/pkg/rootless" "github.com/pkg/errors" "github.com/urfave/cli" ) @@ -55,6 +56,7 @@ func stopCmd(c *cli.Context) error { return err } + rootless.SetSkipStorageSetup(true) runtime, err := libpodruntime.GetRuntime(c) if err != nil { return errors.Wrapf(err, "could not get runtime") -- cgit v1.2.3-54-g00ecf