From: Nick Huber <nicholashuber@gmail.com>
Date: Tue, 31 Dec 2013 20:05:50 +0000 (-0800)
Subject: Use the cgroup name for cpuset for lxc-ps
X-Git-Tag: lxc-1.0.0.beta2~84
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=19a85f1f8ffb67afd8df14173e624260bd398f55;p=thirdparty%2Flxc.git

Use the cgroup name for cpuset for lxc-ps

On my Ubuntu 13.10 system, lxc-ps was always giving empty output. The
output of /proc/$initpid/cgroup was

11:name=systemd:/user/1000.user/c3.session
10:hugetlb:/container
9:perf_event:/container
8:blkio:/container
7:freezer:/container
6:devices:/container
5:memory:/container
4:cpuacct:/container
3:cpu:/container
2:cpuset:/container

Using the cpuset line should be a safer option.

Signed-off-by: Nick Huber <nicholashuber@gmail.com>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>
---

diff --git a/src/lxc/lxc-ps.in b/src/lxc/lxc-ps.in
index ae57e2140..5c6c17568 100644
--- a/src/lxc/lxc-ps.in
+++ b/src/lxc/lxc-ps.in
@@ -118,7 +118,7 @@ for container in ${containers}; do
 
     if ! lxc-wait -P $lxc_path -s STOPPED -n $container -t 0; then
         initpid=`lxc-info -P $lxc_path -p -n $container | awk -F: '{ print $2 }' | awk '{ print $1 }'`
-        cgroup=`head -n 1 /proc/$initpid/cgroup | awk -F: '{ print $3}'`
+        cgroup=`grep cpuset /proc/$initpid/cgroup | awk -F: '{ print $3}'`
         if [ -f "$parent_cgroup/$cgroup/tasks" ]; then
             tasks_files="$tasks_files $parent_cgroup$cgroup/tasks"
         fi