github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-19 09:16:29 +00:00
Code Issues Projects Releases Wiki Activity

Make cgroups v2 the default:

Browse Source 
cgroups v2 has been out since 2015. Not having
to set a kernel parameter helps improve the user
experience by not requiring it when it is required
by services in a build. Making this the default was
discussed back in 2021.

Signed-off-by: Jacob Weinstock <jakobweinstock@gmail.com>
This commit is contained in:
Jacob Weinstock 2024-04-27 15:40:00 -06:00
parent 8afecd5204
commit 803747f01a
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/init/cmd/rc.init/main.go
View File

@ -225,9 +225,7 @@ func doMounts() {
// misc /proc mounted fs // misc /proc mounted fs
mountSilent("binfmt_misc", "/proc/sys/fs/binfmt_misc", "binfmt_misc", noexec|nosuid|nodev, "") mountSilent("binfmt_misc", "/proc/sys/fs/binfmt_misc", "binfmt_misc", noexec|nosuid|nodev, "")
if isCgroupV2() { if isCgroupV1() {
mount("cgroup2", "/sys/fs/cgroup", "cgroup2", noexec|nosuid|nodev, "")
} else {
// mount cgroup root tmpfs // mount cgroup root tmpfs
mount("cgroup_root", "/sys/fs/cgroup", "tmpfs", nodev|noexec|nosuid, "mode=755,size=10m") mount("cgroup_root", "/sys/fs/cgroup", "tmpfs", nodev|noexec|nosuid, "mode=755,size=10m")
// mount cgroups filesystems for all enabled cgroups // mount cgroups filesystems for all enabled cgroups
@ -243,6 +241,8 @@ func doMounts() {
// many things assume systemd // many things assume systemd
mkdir("/sys/fs/cgroup/systemd", 0555) mkdir("/sys/fs/cgroup/systemd", 0555)
mount("cgroup", "/sys/fs/cgroup/systemd", "cgroup", 0, "none,name=systemd") mount("cgroup", "/sys/fs/cgroup/systemd", "cgroup", 0, "none,name=systemd")
} else {
mount("cgroup2", "/sys/fs/cgroup", "cgroup2", noexec|nosuid|nodev, "")
} }
// make / rshared // make / rshared
@ -423,14 +423,14 @@ func doShutdown(action string) {
os.Exit(0) os.Exit(0)
} }
func isCgroupV2() bool { func isCgroupV1() bool {
dt, err := os.ReadFile("/proc/cmdline") dt, err := os.ReadFile("/proc/cmdline")
if err != nil { if err != nil {
log.Printf("error reading /proc/cmdline: %v", err) log.Printf("error reading /proc/cmdline: %v", err)
return false return false
} }
for _, s := range strings.Fields(string(dt)) { for _, s := range strings.Fields(string(dt)) {
if s == "linuxkit.unified_cgroup_hierarchy=1" { if s == "linuxkit.unified_cgroup_hierarchy=0" {
return true return true
} }
} }