diff --git a/patches/openwrt/to-upstream/0022-procd-New-style-of-cgroups.patch b/patches/openwrt/to-upstream/0022-procd-New-style-of-cgroups.patch index 7cf2227daa214b6215caa71b3896601494c24401..3fc329c11ac85ed02a9a70f404b44735430ebdcb 100644 --- a/patches/openwrt/to-upstream/0022-procd-New-style-of-cgroups.patch +++ b/patches/openwrt/to-upstream/0022-procd-New-style-of-cgroups.patch @@ -1,24 +1,22 @@ -From 659ce01011a7aff6a85f11dc1cbb604fd33ed83d Mon Sep 17 00:00:00 2001 +From 7aefacc2c13a668d00b7cab701e195875c3c979c Mon Sep 17 00:00:00 2001 From: Michal Hrusecky <Michal@Hrusecky.net> Date: Wed, 1 May 2019 21:45:31 +0200 Subject: [PATCH] procd: New style of cgroups --- - .../new-style-of-cgroup-hiearchy.patch | 57 +++++++++++++++++++ - 1 file changed, 57 insertions(+) + .../new-style-of-cgroup-hiearchy.patch | 56 +++++++++++++++++++ + 1 file changed, 56 insertions(+) create mode 100644 package/system/procd/patches/new-style-of-cgroup-hiearchy.patch diff --git a/package/system/procd/patches/new-style-of-cgroup-hiearchy.patch b/package/system/procd/patches/new-style-of-cgroup-hiearchy.patch new file mode 100644 -index 0000000000..1d7430269d +index 0000000000..8b530b0659 --- /dev/null +++ b/package/system/procd/patches/new-style-of-cgroup-hiearchy.patch -@@ -0,0 +1,57 @@ -+Index: procd-2018-03-28-dfb68f85/initd/early.c -+=================================================================== -+--- procd-2018-03-28-dfb68f85.orig/initd/early.c -++++ procd-2018-03-28-dfb68f85/initd/early.c -+@@ -52,14 +52,51 @@ early_console(const char *dev) +@@ -0,0 +1,56 @@ ++--- a/initd/early.c +++++ b/initd/early.c ++@@ -53,6 +53,43 @@ early_console(const char *dev) + } + + static void @@ -62,15 +60,16 @@ index 0000000000..1d7430269d + early_mounts(void) + { + unsigned int oldumask = umask(0); -+ -+ 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("tmpfs", "/dev", "tmpfs", MS_NOATIME | MS_NOSUID, "mode=0755,size=512K"); -++ mount_cgroups(); -+ ignore(symlink("/tmp/shm", "/dev/shm")); -+ mkdir("/dev/pts", 0755); -+ mount("devpts", "/dev/pts", "devpts", MS_NOATIME | MS_NOEXEC | MS_NOSUID, "mode=600"); ++@@ -60,8 +97,8 @@ 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); ++- mount("cgroup", "/sys/fs/cgroup", "cgroup", MS_NODEV | MS_NOEXEC | MS_NOSUID, 0); ++ mount("tmpfs", "/dev", "tmpfs", MS_NOATIME | MS_NOSUID, "mode=0755,size=512K"); +++ mount_cgroups(); ++ ignore(symlink("/tmp/shm", "/dev/shm")); ++ mkdir("/dev/pts", 0755); ++ mount("devpts", "/dev/pts", "devpts", MS_NOATIME | MS_NOEXEC | MS_NOSUID, "mode=600"); -- 2.21.0