[lxc-devel] [PATCH] tests: Don't hardcode the cgroup list

[Stéphane Graber]

Signed-off-by: Stéphane Graber <stgraber at ubuntu.com>
---
 src/tests/lxc-test-unpriv     | 2 +-
 src/tests/lxc-test-usernic.in | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/tests/lxc-test-unpriv b/src/tests/lxc-test-unpriv
index 0108b2d..e15edd6 100755
--- a/src/tests/lxc-test-unpriv
+++ b/src/tests/lxc-test-unpriv
@@ -94,7 +94,7 @@ chown -R $TUSER /run/user/$(id -u $TUSER)
 cd $HDIR
 
 if [ -e /sys/fs/cgroup/cgmanager/sock ]; then
-	for d in hugetlb cpuset cpu cpuacct memory devices freezer blkio perf_event; do
+	for d in $(cat /proc/cgroups | grep -v ^# | awk '{print $1}'); do
 		dbus-send --print-reply --address=unix:path=/sys/fs/cgroup/cgmanager/sock \
 			--type=method_call /org/linuxcontainers/cgmanager org.linuxcontainers.cgmanager0_0.Create \
 			string:$d string:$TUSER >/dev/null
diff --git a/src/tests/lxc-test-usernic.in b/src/tests/lxc-test-usernic.in
index 3618bee..a24fa7d 100755
--- a/src/tests/lxc-test-usernic.in
+++ b/src/tests/lxc-test-usernic.in
@@ -87,7 +87,7 @@ lxc.id_map = g 0 910000 10000
 EOF
 
 if [ -e /sys/fs/cgroup/cgmanager/sock ]; then
-	for d in hugetlb cpuset cpu cpuacct memory devices freezer blkio perf_event; do
+	for d in $(cat /proc/cgroups | grep -v ^# | awk '{print $1}'); do
 		dbus-send --print-reply --address=unix:path=/sys/fs/cgroup/cgmanager/sock \
 			--type=method_call /org/linuxcontainers/cgmanager org.linuxcontainers.cgmanager0_0.Create \
 			string:$d string:usernic-user >/dev/null
-- 
1.9.0