emo/openrc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sysfs: fix cgroup hybrid mode

Browse Source 
In hybrid mode, we should not try to mount cgroup2 if it is not
available in the kernel.

This fixes #164.
This commit is contained in:
William Hubbs 2017-09-16 17:02:52 -05:00
parent cd5722aca5
commit 3fafd7a76e
1 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
init.d/sysfs.in
View File

@ -150,6 +150,16 @@ cgroup1_controllers()
return 0 return 0
} }
cgroup2_base()
{
local base
base="$(cgroup2_find_path)"
mkdir -p "${base}"
mount -t cgroup2 none -o "${sysfs_opts},nsdelegate" "${base}" 2> /dev/null ||
mount -t cgroup2 none -o "${sysfs_opts}" "${base}"
return 0
}
cgroup2_controllers() cgroup2_controllers()
{ {
local active cgroup_path x y local active cgroup_path x y
@ -169,13 +179,12 @@ cgroup2_controllers()
cgroups_hybrid() cgroups_hybrid()
{ {
grep -qw cgroup /proc/filesystems && grep -qw cgroup /proc/filesystems || return 0
grep -qw cgroup2 /proc/filesystems ||
return 0
cgroup1_base cgroup1_base
mkdir /sys/fs/cgroup/unified if grep -qw cgroup2 /proc/filesystems; then
mount -t cgroup2 none -o "${sysfs_opts},nsdelegate" /sys/fs/cgroup/unified cgroup2_base
cgroup2_controllers cgroup2_controllers
fi
cgroup1_controllers cgroup1_controllers
return 0 return 0
} }
@ -190,8 +199,8 @@ cgroups_legacy()
cgroups_unified() cgroups_unified()
{ {
grep -qw cgroup2 /proc/filesystems || return 0 cgroup2_base
mount -t cgroup2 none -o "${sysfs_opts},nsdelegate" /sys/fs/cgroup cgroup2_controllers
return 0 return 0
} }