diff options
| author | Giuseppe Scrivano <gscrivan@redhat.com> | 2019-08-12 12:03:51 +0200 |
|---|---|---|
| committer | Giuseppe Scrivano <gscrivan@redhat.com> | 2019-08-12 12:03:53 +0200 |
| commit | dcf20377446a0520da23315869b63d52368f4081 (patch) | |
| tree | ef58b06caf75d7e13c7ead31355e92aac630a803 /cmd/podman/pod_stats.go | |
| parent | 1ef5c4ea8fcf9bbb38a283c5e5898dedab17a33d (diff) | |
| download | podman-dcf20377446a0520da23315869b63d52368f4081.tar.gz podman-dcf20377446a0520da23315869b63d52368f4081.tar.bz2 podman-dcf20377446a0520da23315869b63d52368f4081.zip | |
cmd, stats: fix check for rootless mode
and enable rootless stats when running on cgroups v2.
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
Diffstat (limited to 'cmd/podman/pod_stats.go')
| -rw-r--r-- | cmd/podman/pod_stats.go | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/cmd/podman/pod_stats.go b/cmd/podman/pod_stats.go index 46cacc026..2f1ebd3ac 100644 --- a/cmd/podman/pod_stats.go +++ b/cmd/podman/pod_stats.go @@ -15,6 +15,8 @@ import ( "github.com/containers/libpod/libpod" "github.com/containers/libpod/libpod/define" "github.com/containers/libpod/pkg/adapter" + "github.com/containers/libpod/pkg/cgroups" + "github.com/containers/libpod/pkg/rootless" "github.com/pkg/errors" "github.com/spf13/cobra" ) @@ -53,9 +55,14 @@ func init() { } func podStatsCmd(c *cliconfig.PodStatsValues) error { - - if os.Geteuid() != 0 { - return errors.New("stats is not supported in rootless mode") + 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") + } } format := c.Format |