lxc-test-usernic: drop cgroup handling

This stuff is not needed in a modern systemd based system, and in fact
breaks.  It would probably be better to detect such a system so that a
non-systemd box can still run this test.  But I'm not sure what would be
reliable.

Signed-off-by: Serge Hallyn <serge@hallyn.com>

diff --git a/src/tests/lxc-test-usernic.in b/src/tests/lxc-test-usernic.in
index 9af8678f3cf6d6a882fb8fad2912559eab55f2d3..49fd5e3f7c87e4079711889afb7de4dc6d0d320a 100755 (executable)
--- a/src/tests/lxc-test-usernic.in
+++ b/src/tests/lxc-test-usernic.in
@@ -80,34 +80,6 @@ lxc.idmap = u 0 910000 10000
 lxc.idmap = g 0 910000 10000
 EOF
 
-if command -v cgm >/dev/null 2>&1; then
-       cgm create all usernic-user
-       cgm chown all usernic-user $(id -u usernic-user) $(id -g usernic-user)
-       cgm movepid all usernic-user $$
-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 \
-                       string:$d string:usernic-user >/dev/null
-
-               dbus-send --print-reply --address=unix:path=/sys/fs/cgroup/cgmanager/sock \
-                       --type=method_call /org/linuxcontainers/cgmanager org.linuxcontainers.cgmanager0_0.Chown \
-                       string:$d string:usernic-user int32:$(id -u usernic-user) int32:$(id -g usernic-user) >/dev/null
-
-               dbus-send --print-reply --address=unix:path=/sys/fs/cgroup/cgmanager/sock \
-                       --type=method_call /org/linuxcontainers/cgmanager org.linuxcontainers.cgmanager0_0.MovePid \
-                       string:$d string:usernic-user int32:$$ >/dev/null
-       done
-else
-       for d in /sys/fs/cgroup/*; do
-               [ "$d" = "/sys/fs/cgroup/unified" ] && continue
-               [ -f $d/cgroup.clone_children ] && echo 1 > $d/cgroup.clone_children
-               [ ! -d $d/lxctest ] && mkdir $d/lxctest
-               chown -R usernic-user: $d/lxctest
-               echo $$ > $d/lxctest/tasks
-       done
-fi
-
 mkdir -p /run/user/$(id -u usernic-user)
 chown -R usernic-user: /run/user/$(id -u usernic-user) /home/usernic-user