X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=cgroups.py;h=cbdfbe23c9ac52a3d6b4299c457332ff0435369a;hb=ecee05390277f57b02d21ffca0195292bde1defa;hp=bbb74a3cb9f87d49aa411a6e224d9ab0c7c95e29;hpb=dde04827b57a583c8918129c1afae9bffd908c60;p=nodemanager.git

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