diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-03-19 08:30:05 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-19 08:30:05 -0700 |
| commit | a1299f506d9b93824fae737f0f68a19adaf2bde1 (patch) | |
| tree | ff27a306055f4eb6a1b57455cd15d3c7fe6eccf9 /cmd/podman/ps.go | |
| parent | ac523cbe2b257e13c7b3b823c8de83e44052ffaf (diff) | |
| parent | 4ac08d3aa1882851d4a03aa1e53c47c6fb173958 (diff) | |
| download | podman-a1299f506d9b93824fae737f0f68a19adaf2bde1.tar.gz podman-a1299f506d9b93824fae737f0f68a19adaf2bde1.tar.bz2 podman-a1299f506d9b93824fae737f0f68a19adaf2bde1.zip | |
Merge pull request #2704 from giuseppe/fix-some-rootless
tests: fix rootless tests
Diffstat (limited to 'cmd/podman/ps.go')
| -rw-r--r-- | cmd/podman/ps.go | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/cmd/podman/ps.go b/cmd/podman/ps.go index de6966c3b..ad942da2e 100644 --- a/cmd/podman/ps.go +++ b/cmd/podman/ps.go @@ -17,6 +17,7 @@ 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" @@ -200,6 +201,9 @@ 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() |