From eef2d73a81a9a7941c9e6be8c4fc4acd7da4d00f Mon Sep 17 00:00:00 2001 From: =?utf8?q?Benedikt=20B=C3=B6hm?= Date: Sat, 18 Feb 2012 17:01:59 +0100 Subject: [PATCH] vserver-stat: use /sys/fs/cgroup if it is available --- src/vserver-stat.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/vserver-stat.c b/src/vserver-stat.c index 9e1a015..85ddf89 100644 --- a/src/vserver-stat.c +++ b/src/vserver-stat.c @@ -335,8 +335,14 @@ registerXidCgroups(struct Vector *vec, struct process_info *process) } if ((fd = open(DEFAULTCONFDIR "/cgroup/mnt", O_RDONLY)) == -1) { - strcpy(cgroup, "/dev/cgroup/"); - cgroup_len = sizeof("/dev/cgroup"); + if (utilvserver_isDirectory("/sys/fs/cgroup", false)) { + strcpy(cgroup, "/sys/fs/cgroup/"); + cgroup_len = sizeof("/sys/fs/cgroup"); + per_ss = 1; + } else { + strcpy(cgroup, "/dev/cgroup/"); + cgroup_len = sizeof("/dev/cgroup"); + } } else { cgroup_len = read(fd, cgroup, sizeof(cgroup)); -- 1.8.1.5