summaryrefslogtreecommitdiff
path: root/cmd/podman
diff options
context:
space:
mode:
authorGiuseppe Scrivano <gscrivan@redhat.com>2018-08-28 08:38:00 +0200
committerAtomic Bot <atomic-devel@projectatomic.io>2018-08-28 11:25:01 +0000
commitff4c7a068add2b0a910d2e7f3d442a5c93586e98 (patch)
tree8dd8f8d20824673d2eeda415f0e2f5b9499cb14f /cmd/podman
parentbfedcb4f3c2da84dd51dc886ed8ffc303daf88f7 (diff)
downloadpodman-ff4c7a068add2b0a910d2e7f3d442a5c93586e98.tar.gz
podman-ff4c7a068add2b0a910d2e7f3d442a5c93586e98.tar.bz2
podman-ff4c7a068add2b0a910d2e7f3d442a5c93586e98.zip
rootless, stop: do not create a new userns
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com> Closes: #1360 Approved by: vrothberg
Diffstat (limited to 'cmd/podman')
-rw-r--r--cmd/podman/main.go2
-rw-r--r--cmd/podman/stop.go2
2 files changed, 3 insertions, 1 deletions
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")