tests: Support systemd hybrid cgroups

Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>

diff --git a/src/tests/lxc-test-apparmor-mount b/src/tests/lxc-test-apparmor-mount
index a09fd544383df895a77f14583682bdffdc47bffa..ddcee8a76986981c41ba20d24b16dfb9775a5426 100755 (executable)
--- a/src/tests/lxc-test-apparmor-mount
+++ b/src/tests/lxc-test-apparmor-mount
@@ -132,6 +132,7 @@ elif [ -e /sys/fs/cgroup/cgmanager/sock ]; then
        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 $TUSER: $d/lxctest

diff --git a/src/tests/lxc-test-unpriv b/src/tests/lxc-test-unpriv
index 5fe0927948cd5e1170e80c6112e33e6d1e0ff702..5f2a18f68283f3d19c8bad015658df346027960d 100755 (executable)
--- a/src/tests/lxc-test-unpriv
+++ b/src/tests/lxc-test-unpriv
@@ -148,6 +148,7 @@ elif [ -e /sys/fs/cgroup/cgmanager/sock ]; then
        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 $TUSER: $d/lxctest

diff --git a/src/tests/lxc-test-usernic.in b/src/tests/lxc-test-usernic.in
index f7d19a362cae02550d28f7892ed1487539e22e30..3e35008c6a8fc83f19d50557c17fbda808fefd96 100755 (executable)
--- a/src/tests/lxc-test-usernic.in
+++ b/src/tests/lxc-test-usernic.in
@@ -105,6 +105,7 @@ elif [ -e /sys/fs/cgroup/cgmanager/sock ]; then
        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