containers
/
podman
mirror of https://github.com/containers/podman.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2881 from edsantiago/revert_2832 

ps: now works with --size and nonroot
This commit is contained in:
OpenShift Merge Robot 2019-04-09 12:51:11 -07:00 committed by GitHub
parent fe79bdd07e cebb7ebbee
commit 40a1df38d1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/podman/ps.go
View File

@ -205,10 +205,6 @@ func psCmd(c *cliconfig.PsValues) error {
span, _ := opentracing.StartSpanFromContext(Ctx, "psCmd") span, _ := opentracing.StartSpanFromContext(Ctx, "psCmd")
defer span.Finish() defer span.Finish()
} }
// TODO disable when single rootless userns merges
if c.Bool("size") && os.Geteuid() != 0 {
return errors.New("the --size option is not presently supported without root")
}
var watch bool var watch bool