From: Stéphane Graber Date: Thu, 13 Mar 2014 23:02:11 +0000 (-0400) Subject: tests: Don't hardcode the cgroup list X-Git-Tag: lxc-1.1.0.alpha1~204 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0cd97e965832182d8d619236faf696a71a26d6c3;p=thirdparty%2Flxc.git tests: Don't hardcode the cgroup list Signed-off-by: Stéphane Graber Acked-by: Serge E. Hallyn --- 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