diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-08-12 16:53:46 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-12 16:53:46 +0200 |
| commit | ec93c9d8753c1cf346fe7fee3035af1a0dcf9b55 (patch) | |
| tree | 37a407bad913399b31b543db9caa7dbb5e13a232 /cmd/podman/stats.go | |
| parent | f18cfa47686a30166cfe6f743dbda0e13575e4f2 (diff) | |
| parent | 9e2f9c8b7804cec7ed7bcf595272de976f799ef6 (diff) | |
| download | podman-ec93c9d8753c1cf346fe7fee3035af1a0dcf9b55.tar.gz podman-ec93c9d8753c1cf346fe7fee3035af1a0dcf9b55.tar.bz2 podman-ec93c9d8753c1cf346fe7fee3035af1a0dcf9b55.zip | |
Merge pull request #3786 from giuseppe/fix-rootless-checks
rootless: drop some superflous checks
Diffstat (limited to 'cmd/podman/stats.go')
| -rw-r--r-- | cmd/podman/stats.go | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/cmd/podman/stats.go b/cmd/podman/stats.go index 3accae1b6..2f696445e 100644 --- a/cmd/podman/stats.go +++ b/cmd/podman/stats.go @@ -2,7 +2,6 @@ package main import ( "fmt" - "os" "reflect" "strings" "time" @@ -13,6 +12,8 @@ import ( "github.com/containers/libpod/cmd/podman/libpodruntime" "github.com/containers/libpod/libpod" "github.com/containers/libpod/libpod/define" + "github.com/containers/libpod/pkg/cgroups" + "github.com/containers/libpod/pkg/rootless" "github.com/docker/go-units" "github.com/pkg/errors" "github.com/spf13/cobra" @@ -66,8 +67,14 @@ func init() { } func statsCmd(c *cliconfig.StatsValues) error { - if os.Geteuid() != 0 { - return errors.New("stats is not supported for rootless containers") + if rootless.IsRootless() { + unified, err := cgroups.IsCgroup2UnifiedMode() + if err != nil { + return err + } + if !unified { + return errors.New("stats is not supported in rootless mode without cgroups v2") + } } all := c.All |