zishuo/runc
1
0
Fork 0
mirror of https://github.com/opencontainers/runc.git synced 2025-10-31 19:13:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

libct/cg/utils: use fscommon.ReadFile

Browse Source 
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
This commit is contained in:
Kir Kolyshkin
2020-09-24 17:10:26 -07:00
parent 6bae53f589
commit e25b8cfcd5
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libcontainer/cgroups/utils.go
View File

@@ -15,6 +15,7 @@ import (
"sync" "sync"
"time" "time"
"github.com/opencontainers/runc/libcontainer/cgroups/fscommon"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"golang.org/x/sys/unix" "golang.org/x/sys/unix"
) )
@@ -79,11 +80,11 @@ func GetAllSubsystems() ([]string, error) {
// - freezer: implemented in kernel 5.2 // - freezer: implemented in kernel 5.2
// We assume these are always available, as it is hard to detect availability. // We assume these are always available, as it is hard to detect availability.
pseudo := []string{"devices", "freezer"} pseudo := []string{"devices", "freezer"}
data, err := ioutil.ReadFile("/sys/fs/cgroup/cgroup.controllers") data, err := fscommon.ReadFile("/sys/fs/cgroup", "cgroup.controllers")
if err != nil { if err != nil {
return nil, err return nil, err
} }
subsystems := append(pseudo, strings.Fields(string(data))...) subsystems := append(pseudo, strings.Fields(data)...)
return subsystems, nil return subsystems, nil
} }
f, err := os.Open("/proc/cgroups") f, err := os.Open("/proc/cgroups")