From: Stéphane Graber Date: Mon, 22 Sep 2014 22:08:49 +0000 (-0400) Subject: Fix the unprivileged tests cgroup management X-Git-Tag: lxc-1.0.6~3 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fed27315eb7fd9b60257c876578ed626368c391d;p=thirdparty%2Flxc.git Fix the unprivileged tests cgroup management To cover all the cases we have around, we need to: - Attempt to use cgm if present (preferred) - Attempt to use cgmanager directly over dbus otherwise - Fallback to cgroupfs Signed-off-by: Stéphane Graber Acked-by: Serge Hallyn --- diff --git a/src/tests/lxc-test-unpriv b/src/tests/lxc-test-unpriv index 59c264032..6235901c7 100755 --- a/src/tests/lxc-test-unpriv +++ b/src/tests/lxc-test-unpriv @@ -92,7 +92,11 @@ chown -R $TUSER: /run/user/$(id -u $TUSER) cd $HDIR -if [ -e /sys/fs/cgroup/cgmanager/sock ]; then +if which cgm >/dev/null 2>&1; then + cgm create all $TUSER + cgm chown all $TUSER $(id -u $TUSER) $(id -g $TUSER) + cgm movepid all $TUSER $$ +elif [ -e /sys/fs/cgroup/cgmanager/sock ]; then for d in $(cut -d : -f 2 /proc/self/cgroup); do dbus-send --print-reply --address=unix:path=/sys/fs/cgroup/cgmanager/sock \ --type=method_call /org/linuxcontainers/cgmanager org.linuxcontainers.cgmanager0_0.Create \ diff --git a/src/tests/lxc-test-usernic.in b/src/tests/lxc-test-usernic.in index 7955d4f65..8d78fea59 100755 --- a/src/tests/lxc-test-usernic.in +++ b/src/tests/lxc-test-usernic.in @@ -84,7 +84,11 @@ lxc.id_map = u 0 910000 10000 lxc.id_map = g 0 910000 10000 EOF -if [ -e /sys/fs/cgroup/cgmanager/sock ]; then +if which cgm >/dev/null 2>&1; then + cgm create all $TUSER + cgm chown all $TUSER $(id -u $TUSER) $(id -g $TUSER) + cgm movepid all $TUSER $$ +elif [ -e /sys/fs/cgroup/cgmanager/sock ]; then for d in $(cut -d : -f 2 /proc/self/cgroup); do dbus-send --print-reply --address=unix:path=/sys/fs/cgroup/cgmanager/sock \ --type=method_call /org/linuxcontainers/cgmanager org.linuxcontainers.cgmanager0_0.Create \