diff options
Diffstat (limited to 'aports/openrc/0001-sh-rc-cgroup.sh-add-openrc.-prefix-the-cgroupv2-path.patch')
| -rw-r--r-- | aports/openrc/0001-sh-rc-cgroup.sh-add-openrc.-prefix-the-cgroupv2-path.patch | 57 |
1 files changed, 57 insertions, 0 deletions
diff --git a/aports/openrc/0001-sh-rc-cgroup.sh-add-openrc.-prefix-the-cgroupv2-path.patch b/aports/openrc/0001-sh-rc-cgroup.sh-add-openrc.-prefix-the-cgroupv2-path.patch new file mode 100644 index 0000000..3b4ff76 --- /dev/null +++ b/aports/openrc/0001-sh-rc-cgroup.sh-add-openrc.-prefix-the-cgroupv2-path.patch @@ -0,0 +1,57 @@ +From abe447e2fbfb55d9fbff624bf44f46cb1c8622cb Mon Sep 17 00:00:00 2001 +From: Natanael Copa <ncopa@alpinelinux.org> +Date: Fri, 15 Dec 2023 18:52:28 +0100 +Subject: [PATCH] sh/rc-cgroup.sh: add openrc. prefix the cgroupv2 path + +Some services, like docker, creates and manages /sys/fs/cgroup/<service> +themselves. Avoid conflict with the openrc created cgroup path by adding +a `openrc.` prefix. + +Fixes: https://github.com/OpenRC/openrc/issues/680 +--- + sh/rc-cgroup.sh | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/sh/rc-cgroup.sh b/sh/rc-cgroup.sh +index e5c7ae7f..f10e328c 100644 +--- a/sh/rc-cgroup.sh ++++ b/sh/rc-cgroup.sh +@@ -35,7 +35,7 @@ cgroup_get_pids() + cgroup_pids= + cgroup_procs="$(cgroup2_find_path)" + if [ -n "${cgroup_procs}" ]; then +- cgroup_procs="${cgroup_procs}/${RC_SVCNAME}/cgroup.procs" ++ cgroup_procs="${cgroup_procs}/openrc.${RC_SVCNAME}/cgroup.procs" + else + cgroup_procs="/sys/fs/cgroup/openrc/${RC_SVCNAME}/tasks" + fi +@@ -167,7 +167,7 @@ cgroup2_remove() + local cgroup_path rc_cgroup_path + cgroup_path="$(cgroup2_find_path)" + [ -z "${cgroup_path}" ] && return 0 +- rc_cgroup_path="${cgroup_path}/${RC_SVCNAME}" ++ rc_cgroup_path="${cgroup_path}/openrc.${RC_SVCNAME}" + [ ! -d "${rc_cgroup_path}" ] || + [ ! -e "${rc_cgroup_path}"/cgroup.events ] && + return 0 +@@ -191,7 +191,7 @@ cgroup2_set_limits() + cgroup_path="$(cgroup2_find_path)" + [ -z "${cgroup_path}" ] && return 0 + mountinfo -q "${cgroup_path}"|| return 0 +- rc_cgroup_path="${cgroup_path}/${RC_SVCNAME}" ++ rc_cgroup_path="${cgroup_path}/openrc.${RC_SVCNAME}" + [ ! -d "${rc_cgroup_path}" ] && mkdir "${rc_cgroup_path}" + [ -f "${rc_cgroup_path}"/cgroup.procs ] && + printf 0 > "${rc_cgroup_path}"/cgroup.procs +@@ -210,7 +210,7 @@ cgroup2_kill_cgroup() { + local cgroup_path + cgroup_path="$(cgroup2_find_path)" + [ -z "${cgroup_path}" ] && return 1 +- rc_cgroup_path="${cgroup_path}/${RC_SVCNAME}" ++ rc_cgroup_path="${cgroup_path}/openrc.${RC_SVCNAME}" + if [ -f "${rc_cgroup_path}"/cgroup.kill ]; then + printf "%d" 1 > "${rc_cgroup_path}"/cgroup.kill + fi +-- +2.43.0 + |