diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-09-25 18:22:50 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-25 18:22:50 +0000 |
| commit | bb8e77d7f42ae361d11161239bd5c7ac6fa5d719 (patch) | |
| tree | b5baf2651f434559093921a4948b1924682d3b6a /libpod/info.go | |
| parent | 17db9851d05544ef49f8bce0deec452a99aae2a9 (diff) | |
| parent | 65f2f1a7639eb5bc12e6c522c111be18786870c9 (diff) | |
| download | podman-bb8e77d7f42ae361d11161239bd5c7ac6fa5d719.tar.gz podman-bb8e77d7f42ae361d11161239bd5c7ac6fa5d719.tar.bz2 podman-bb8e77d7f42ae361d11161239bd5c7ac6fa5d719.zip | |
Merge pull request #7785 from mheon/backports_211
Backports for v2.1.1
Diffstat (limited to 'libpod/info.go')
| -rw-r--r-- | libpod/info.go | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libpod/info.go b/libpod/info.go index 153000b6f..dd7a521c1 100644 --- a/libpod/info.go +++ b/libpod/info.go @@ -87,6 +87,7 @@ func (r *Runtime) hostInfo() (*define.HostInfo, error) { info := define.HostInfo{ Arch: runtime.GOARCH, BuildahVersion: buildah.Version, + CgroupManager: r.config.Engine.CgroupManager, Linkmode: linkmode.Linkmode(), CPUs: runtime.NumCPU(), Distribution: hostDistributionInfo, |