maple/prplos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

prplOS: procd: LCM: rebase patches

Browse Source 
We've 3 downstream patches for procd which were cherry-picked from 22.03
release and this commit rebases them onto the procd from OpenWrt 23.05.

Signed-off-by: Petr Štetiar <petr.stetiar@prplfoundation.org>
This commit is contained in:
Petr Štetiar 2024-04-19 17:53:24 +00:00
parent 9d28d88ad9
commit 75d5ec436d
No known key found for this signature in database
GPG Key ID: 58EE120F30CC02D3
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
package/system/procd/patches/000-initd-cgroups-mount-legacy-hierarchy.patch
View File

@ -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");

2
package/system/procd/patches/001-initd-cgroups-cpuset-initialize-clone_children.patch
View File

@ -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();

2
package/system/procd/patches/003-initd-cgroups-mount-systemd-controller-label.patch
View File

@ -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();