From e25b8cfcd5d97b7f1fb8b6800e2bbf8f57680c93 Mon Sep 17 00:00:00 2001 From: Kir Kolyshkin Date: Thu, 24 Sep 2020 17:10:26 -0700 Subject: [PATCH] libct/cg/utils: use fscommon.ReadFile Signed-off-by: Kir Kolyshkin --- libcontainer/cgroups/utils.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libcontainer/cgroups/utils.go b/libcontainer/cgroups/utils.go index bc98375ea..c26be8cd2 100644 --- a/libcontainer/cgroups/utils.go +++ b/libcontainer/cgroups/utils.go @@ -15,6 +15,7 @@ import ( "sync" "time" + "github.com/opencontainers/runc/libcontainer/cgroups/fscommon" "github.com/sirupsen/logrus" "golang.org/x/sys/unix" ) @@ -79,11 +80,11 @@ func GetAllSubsystems() ([]string, error) { // - freezer: implemented in kernel 5.2 // We assume these are always available, as it is hard to detect availability. 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 { return nil, err } - subsystems := append(pseudo, strings.Fields(string(data))...) + subsystems := append(pseudo, strings.Fields(data)...) return subsystems, nil } f, err := os.Open("/proc/cgroups")