Fix mount(cgroup2) for older kernels.

Linux 4.15 doesn't like empty string for cgroup2 mount options. Pass NULL then to satisfy the kernel check. Log the options for easier debugging. Signed-off-by: Michał Mirosław <emmir@google.com>
checkpoint-restore · Jun 15, 2023 · 11288c9 · 11288c9
1 parent af0e413
commit 11288c9
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/criu/cgroup.c b/criu/cgroup.c
@@ -639,8 +639,8 @@ static int open_cgroupfs(struct cg_ctl *cc)
 		return -1;
 	}
 
-	if (mount("none", prefix, fstype, 0, mopts) < 0) {
-		pr_perror("Unable to mount %s", mopts);
+	if (mount("none", prefix, fstype, 0, mopts[0] ? mopts : NULL) < 0) {
+		pr_perror("Unable to mount %s %s", fstype, mopts);
 		rmdir(prefix);
 		return -1;
 	}