From: Pablo Neira Ayuso <pablo@netfilter.org>
Date: Thu, 16 Jan 2025 13:26:31 +0000 (+0100)
Subject: tests: shell: use mount --bind to change cgroupsv2 root
X-Git-Tag: v1.1.2~94
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e29b3cd9b094c94ddd7b8c13e0724a252d53e2cf;p=thirdparty%2Fnftables.git

tests: shell: use mount --bind to change cgroupsv2 root

Instead of remount which fails with SKIP in one of my test boxes because
cgroupsv2 rootfs is busy.

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---

diff --git a/tests/shell/testcases/packetpath/cgroupv2 b/tests/shell/testcases/packetpath/cgroupv2
index 20bd18ae..5c5bea0c 100755
--- a/tests/shell/testcases/packetpath/cgroupv2
+++ b/tests/shell/testcases/packetpath/cgroupv2
@@ -126,7 +126,7 @@ if [ "$doit" != "setup-done" ];then
 	rc=$?
 else
 	want_inode=$(stat --printf=%i "/sys/fs/cgroup/nft-test1a/")
-	mount -t cgroup2 cgroup2 /sys/fs/cgroup
+	mount --bind /sys/fs/cgroup/nft-test1a/ /sys/fs/cgroup/
 
 	# /sys/fs/cgroup/  should now match "/sys/fs/cgroup/nft-test1a/cgroup.procs"
 	rootinode=$(stat --printf=%i "/sys/fs/cgroup/")
@@ -138,6 +138,8 @@ else
 
 	do_initial_setup
 	run_test
+
+	umount /sys/fs/group/
 fi
 
 exit $rc