diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-01-17 12:57:20 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-17 12:57:20 +0100 |
| commit | 8514ebd1827b12bae8b5d53d8f0e36244d1b3c3a (patch) | |
| tree | d8ccbe18806a8d03ac1d89754d4f009103803c5e /libpod/info.go | |
| parent | 26cf6c82c82cbf45afe5998e4a881b9f52202a01 (diff) | |
| parent | 607cb80bf77642c02b80bff56aa4c3e396a91fa0 (diff) | |
| download | podman-8514ebd1827b12bae8b5d53d8f0e36244d1b3c3a.tar.gz podman-8514ebd1827b12bae8b5d53d8f0e36244d1b3c3a.tar.bz2 podman-8514ebd1827b12bae8b5d53d8f0e36244d1b3c3a.zip | |
Merge pull request #12860 from rhatdan/cgroups
Use CONTAINERS_CONF cgroups flag for remote API.
Diffstat (limited to 'libpod/info.go')
| -rw-r--r-- | libpod/info.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libpod/info.go b/libpod/info.go index 354364ccc..de675859e 100644 --- a/libpod/info.go +++ b/libpod/info.go @@ -104,7 +104,7 @@ func (r *Runtime) hostInfo() (*define.HostInfo, error) { return nil, errors.Wrapf(err, "error getting Seccomp profile path") } - // CGroups version + // Cgroups version unified, err := cgroups.IsCgroup2UnifiedMode() if err != nil { return nil, errors.Wrapf(err, "error reading cgroups mode") @@ -150,7 +150,7 @@ func (r *Runtime) hostInfo() (*define.HostInfo, error) { if unified { cgroupVersion = "v2" } - info.CGroupsVersion = cgroupVersion + info.CgroupsVersion = cgroupVersion slirp4netnsPath := r.config.Engine.NetworkCmdPath if slirp4netnsPath == "" { |