diff --git a/package/system/procd/patches/000-initd-cgroups-mount-legacy-hierarchy.patch b/package/system/procd/patches/000-initd-cgroups-mount-legacy-hierarchy.patch index 37bff2b9a2..8c1adb0ba8 100644 --- a/package/system/procd/patches/000-initd-cgroups-mount-legacy-hierarchy.patch +++ b/package/system/procd/patches/000-initd-cgroups-mount-legacy-hierarchy.patch @@ -49,13 +49,13 @@ { unsigned int oldumask = umask(0); @@ -61,7 +95,9 @@ early_mounts(void) - mount("proc", "/proc", "proc", MS_NOATIME | MS_NODEV | MS_NOEXEC | MS_NOSUID, NULL); - mount("sysfs", "/sys", "sysfs", MS_NOATIME | MS_NODEV | MS_NOEXEC | MS_NOSUID, NULL); - mount("efivars", "/sys/firmware/efi/efivars", "efivarfs", MS_NOATIME | MS_NODEV | MS_NOEXEC | MS_NOSUID, NULL); + mount("proc", "/proc", "proc", MS_NODEV | MS_NOEXEC | MS_NOSUID | MS_RELATIME, NULL); + mount("sysfs", "/sys", "sysfs", MS_NODEV | MS_NOEXEC | MS_NOSUID | MS_RELATIME, NULL); + mount("efivars", "/sys/firmware/efi/efivars", "efivarfs", MS_NODEV | MS_NOEXEC | MS_NOSUID | MS_RELATIME, NULL); - mount("cgroup2", "/sys/fs/cgroup", "cgroup2", MS_NODEV | MS_NOEXEC | MS_NOSUID | MS_RELATIME, "nsdelegate"); + LOG("Attempting to mount cgroups (tmpfs + controller subdirs)\n"); + mount("cgroup2", PATH_CGROUP, "tmpfs", MS_NODEV | MS_NOEXEC | MS_NOSUID, "size=512K"); + mount_cgroup_controllers(); - mount("tmpfs", "/dev", "tmpfs", MS_NOATIME | MS_NOEXEC | MS_NOSUID, "mode=0755,size=512K"); + mount("tmpfs", "/dev", "tmpfs", MS_NOEXEC | MS_NOSUID | MS_RELATIME, "mode=0755,size=512K"); ignore(symlink("/tmp/shm", "/dev/shm")); mkdir("/dev/pts", 0755); diff --git a/package/system/procd/patches/001-initd-cgroups-cpuset-initialize-clone_children.patch b/package/system/procd/patches/001-initd-cgroups-cpuset-initialize-clone_children.patch index 54662fb9c7..e2706dd9bc 100644 --- a/package/system/procd/patches/001-initd-cgroups-cpuset-initialize-clone_children.patch +++ b/package/system/procd/patches/001-initd-cgroups-cpuset-initialize-clone_children.patch @@ -36,6 +36,6 @@ mount("cgroup2", PATH_CGROUP, "tmpfs", MS_NODEV | MS_NOEXEC | MS_NOSUID, "size=512K"); mount_cgroup_controllers(); + init_cpuset(); - mount("tmpfs", "/dev", "tmpfs", MS_NOATIME | MS_NOEXEC | MS_NOSUID, "mode=0755,size=512K"); + mount("tmpfs", "/dev", "tmpfs", MS_NOEXEC | MS_NOSUID | MS_RELATIME, "mode=0755,size=512K"); ignore(symlink("/tmp/shm", "/dev/shm")); mkdir("/dev/pts", 0755); diff --git a/package/system/procd/patches/003-initd-cgroups-mount-systemd-controller-label.patch b/package/system/procd/patches/003-initd-cgroups-mount-systemd-controller-label.patch index 82c33895c6..975e32cadb 100644 --- a/package/system/procd/patches/003-initd-cgroups-mount-systemd-controller-label.patch +++ b/package/system/procd/patches/003-initd-cgroups-mount-systemd-controller-label.patch @@ -11,6 +11,6 @@ + mount("cgroup2", PATH_CGROUP "/systemd", "cgroup2", MS_NOATIME | MS_NODEV | MS_NOEXEC | MS_NOSUID, "none,name=systemd"); + LOG("Mounted " PATH_CGROUP "/systemd"); + } - mount("tmpfs", "/dev", "tmpfs", MS_NOATIME | MS_NOEXEC | MS_NOSUID, "mode=0755,size=512K"); + mount("tmpfs", "/dev", "tmpfs", MS_NOEXEC | MS_NOSUID | MS_RELATIME, "mode=0755,size=512K"); ignore(symlink("/tmp/shm", "/dev/shm")); mkdir("/dev/pts", 0755);