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 6a50f54ef62e33f655254e90471b0a1612f8fad2..869b311ee0f0dffb2156ecd406e004919dcdd2c6 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 15a322017bbeff3b7c750afe52646219cb066320..6afe11adad5f5de6f9c87c4029c674c803572b73 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 74b6d53337201da3705641699208cf0aed03b91f..642115db904c23eb91ec17646babedc6abc02467 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