diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2023-12-15 18:52:28 +0100 |
|---|---|---|
| committer | William Hubbs <w.d.hubbs@gmail.com> | 2024-01-09 10:09:59 -0600 |
| commit | 97689d6c4478cd3a388402cb4d3a2db82b99cc78 (patch) | |
| tree | 370afb31aa126620ff8af70b4c23768a3321c846 | |
| parent | 439cce426d8a072ca2049fdb313eead3264b42ff (diff) | |
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
| -rw-r--r-- | sh/rc-cgroup.sh | 8 |
1 files 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 |