From 19a85f1f8ffb67afd8df14173e624260bd398f55 Mon Sep 17 00:00:00 2001 From: Nick Huber Date: Tue, 31 Dec 2013 12:05:50 -0800 Subject: [PATCH] Use the cgroup name for cpuset for lxc-ps MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Acked-by: Stéphane Graber --- src/lxc/lxc-ps.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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