- cpusetBase = os.path.join(BASE_DIR, subsystem, 'libvirt', 'lxc')
- return filter(os.path.isdir,
- map(lambda f: os.path.join(cpusetBase, f),
- os.listdir(cpusetBase)))
+ cpusetBases = [
+ # observed on f16-f18
+ 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
+ def merge(l1,l2): return l1+l2
+ return reduce (lambda l1,l2: l1+l2,
+ [ [ dir for dir in
+ [ os.path.join(cpusetBase, f) for f in os.listdir(cpusetBase) ]
+ if os.path.isdir(dir) ]
+ for cpusetBase in cpusetBases if os.path.isdir (cpusetBase) ])