From da5afb8a29c1287f35cb7196a91bc1aa16a18263 Mon Sep 17 00:00:00 2001 From: =?utf8?q?St=C3=A9phane=20Graber?= Date: Thu, 13 Mar 2014 19:02:11 -0400 Subject: [PATCH] tests: Don't hardcode the cgroup list MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Stéphane Graber Acked-by: Serge E. Hallyn --- 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 0108b2d3c..01ae8282f 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 $(grep -v ^# /proc/cgroups | 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 3618beecd..61535080c 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 $(grep -v ^# /proc/cgroups | 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 -- 2.47.2