cgroup2: add minimal cgroup2 support

The runc test cases are (sometimes) mounting a cgroup inside of the container. For these tests to succeed, let CRIU know that cgroup2 exists and how to restore such a mount. This does not fix any specific cgroup2 settings, it just enables CRIU to mount cgroup2 in the restored container. Signed-off-by: Adrian Reber <[email protected]>
checkpoint-restore · Feb 7, 2020 · 3a15076 · 3a15076
1 parent 0ac0f68
commit 3a15076
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/criu/filesystems.c b/criu/filesystems.c
@@ -747,6 +747,11 @@ static struct fstype fstypes[] = {
 		.code = FSTYPE__CGROUP,
 		.parse = cgroup_parse,
 		.sb_equal = cgroup_sb_equal,
+	}, {
+		.name = "cgroup2",
+		.code = FSTYPE__CGROUP2,
+		.parse = cgroup_parse,
+		.sb_equal = cgroup_sb_equal,
 	}, {
 		.name = "aufs",
 		.code = FSTYPE__AUFS,

diff --git a/images/mnt.proto b/images/mnt.proto
@@ -28,6 +28,8 @@ enum fstype {
 	// RPC_PIPEFS		= 20;
 	// NFS			= 21;
 	// NFS4			= 22;
+
+	CGROUP2			= 23;
 };
 
 message mnt_entry {