From 2278a219e208ae964d587f3a0bf0d2f299bf1fcb Mon Sep 17 00:00:00 2001 From: Scott Baker Date: Thu, 16 Jan 2014 23:44:37 -0800 Subject: [PATCH] libvirt 1.2.1 support --- cgroups.py | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/cgroups.py b/cgroups.py index bbb74a3..cbdfbe2 100644 --- a/cgroups.py +++ b/cgroups.py @@ -56,6 +56,8 @@ def get_cgroup_paths(subsystem="cpuset"): os.path.join(BASE_DIR, subsystem, 'libvirt', 'lxc'), # as observed on f20 os.path.join(BASE_DIR, subsystem ), + # as observed on f16 libvirt 1.2.1 + os.path.join(BASE_DIR, subsystem, 'machine'), ] # try several locations and return all the results # get_cgroup_path will sort it out @@ -68,9 +70,16 @@ def get_cgroup_paths(subsystem="cpuset"): def get_cgroup_path(name, subsystem="cpuset"): """ Returns the base path for the cgroup with a specific name or None.""" - return reduce(lambda a, b: b if os.path.basename(b) == name else a, + result = reduce(lambda a, b: b if os.path.basename(b) == name else a, get_cgroup_paths(subsystem), None) + if result is None: + name = name + ".libvirt-lxc" + result = reduce(lambda a, b: b if os.path.basename(b) == name else a, + get_cgroup_paths(subsystem), None) + + return result + def get_base_path(): return BASE_DIR -- 2.43.0