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 9a14e5c904..37bff2b9a2 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 @@ -48,10 +48,10 @@ early_mounts(void) { unsigned int oldumask = umask(0); -@@ -60,7 +94,9 @@ 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); +@@ -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("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"); 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 df6434e93f..54662fb9c7 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 @@ -31,7 +31,7 @@ early_mounts(void) { unsigned int oldumask = umask(0); -@@ -97,6 +114,7 @@ early_mounts(void) +@@ -98,6 +115,7 @@ early_mounts(void) 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(); 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 b09b3802fc..82c33895c6 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 @@ -1,6 +1,6 @@ --- a/initd/early.c +++ b/initd/early.c -@@ -115,6 +115,13 @@ early_mounts(void) +@@ -116,6 +116,13 @@ early_mounts(void) mount("cgroup2", PATH_CGROUP, "tmpfs", MS_NODEV | MS_NOEXEC | MS_NOSUID, "size=512K"); mount_cgroup_controllers(); init_cpuset();