initd: attempt to mount cgroup2

Prepare for using cgroup2 in procd and ujail.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>

diff --git a/initd/early.c b/initd/early.c
index 7b281b20b8233785de957d6b0dba23338e916e45..d69495e3bba3d8fad4dcf109a932a38e4ddff560 100644 (file)
--- a/initd/early.c
+++ b/initd/early.c
@@ -60,7 +60,7 @@ early_mounts(void)
        if (!is_container()) {
                mount("proc", "/proc", "proc", MS_NOATIME | MS_NODEV | MS_NOEXEC | MS_NOSUID, 0);
                mount("sysfs", "/sys", "sysfs", MS_NOATIME | MS_NODEV | MS_NOEXEC | MS_NOSUID, 0);
        if (!is_container()) {
                mount("proc", "/proc", "proc", MS_NOATIME | MS_NODEV | MS_NOEXEC | MS_NOSUID, 0);
                mount("sysfs", "/sys", "sysfs", MS_NOATIME | MS_NODEV | MS_NOEXEC | MS_NOSUID, 0);

-               mount("cgroup", "/sys/fs/cgroup", "cgroup",  MS_NODEV | MS_NOEXEC | MS_NOSUID, 0);
+               mount("cgroup2", "/sys/fs/cgroup", "cgroup2",  MS_NODEV | MS_NOEXEC | MS_NOSUID | MS_RELATIME, "nsdelegate");

                mount("tmpfs", "/dev", "tmpfs", MS_NOATIME | MS_NOSUID, "mode=0755,size=512K");
                ignore(symlink("/tmp/shm", "/dev/shm"));
                mkdir("/dev/pts", 0755);
                mount("tmpfs", "/dev", "tmpfs", MS_NOATIME | MS_NOSUID, "mode=0755,size=512K");
                ignore(symlink("/tmp/shm", "/dev/shm"));
                mkdir("/dev/pts", 0755);