diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-04-04 09:21:09 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-04 09:21:09 -0700 |
| commit | 1759eb09e1c13bc8392d515d69ca93226d067c73 (patch) | |
| tree | c769a191ec8cfb779a76ebcbc2e8638dbd56f549 /cmd/podman/pod_stop.go | |
| parent | 71555a9ea015ebc1bf872a502d254e0b903ffcb4 (diff) | |
| parent | 72382a12a7b5ac85e53474dfd6dcd83cd64a2738 (diff) | |
| download | podman-1759eb09e1c13bc8392d515d69ca93226d067c73.tar.gz podman-1759eb09e1c13bc8392d515d69ca93226d067c73.tar.bz2 podman-1759eb09e1c13bc8392d515d69ca93226d067c73.zip | |
Merge pull request #2706 from giuseppe/rootless-single-usernamespace
rootless: single user namespace
Diffstat (limited to 'cmd/podman/pod_stop.go')
| -rw-r--r-- | cmd/podman/pod_stop.go | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/cmd/podman/pod_stop.go b/cmd/podman/pod_stop.go index 754a3a7db..f1b0ac51f 100644 --- a/cmd/podman/pod_stop.go +++ b/cmd/podman/pod_stop.go @@ -2,11 +2,9 @@ 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" @@ -48,24 +46,12 @@ 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) |