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/ps.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/ps.go')
| -rw-r--r-- | cmd/podman/ps.go | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/cmd/podman/ps.go b/cmd/podman/ps.go index 71c8dee97..759a03b86 100644 --- a/cmd/podman/ps.go +++ b/cmd/podman/ps.go @@ -17,7 +17,6 @@ import ( "github.com/containers/libpod/cmd/podman/libpodruntime" "github.com/containers/libpod/cmd/podman/shared" "github.com/containers/libpod/libpod" - "github.com/containers/libpod/pkg/rootless" "github.com/containers/libpod/pkg/util" "github.com/cri-o/ocicni/pkg/ocicni" "github.com/docker/go-units" @@ -202,9 +201,6 @@ func init() { } func psCmd(c *cliconfig.PsValues) error { - if os.Geteuid() != 0 { - rootless.SetSkipStorageSetup(true) - } if c.Bool("trace") { span, _ := opentracing.StartSpanFromContext(Ctx, "psCmd") defer span.Finish() |