53 lines
1.9 KiB
Diff
53 lines
1.9 KiB
Diff
|
From 198a2806b0b5522cff1c53bf4671cfee85e45608 Mon Sep 17 00:00:00 2001
|
||
|
From: Kir Kolyshkin <kolyshkin@gmail.com>
|
||
|
Date: Tue, 23 Feb 2021 18:25:56 -0800
|
||
|
Subject: [PATCH 3/5] libct/rootfs/mountCgroupV2: minor refactor
|
||
|
|
||
|
1. s/cgroupPath/dest/
|
||
|
|
||
|
2. don't hardcode /sys/fs/cgroup
|
||
|
|
||
|
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
|
||
|
---
|
||
|
libcontainer/rootfs_linux.go | 10 ++++++----
|
||
|
1 file changed, 6 insertions(+), 4 deletions(-)
|
||
|
|
||
|
diff --git a/libcontainer/rootfs_linux.go b/libcontainer/rootfs_linux.go
|
||
|
index a384abb7e8a5..0f0495b93b3e 100644
|
||
|
--- a/libcontainer/rootfs_linux.go
|
||
|
+++ b/libcontainer/rootfs_linux.go
|
||
|
@@ -17,6 +17,7 @@ import (
|
||
|
"github.com/moby/sys/mountinfo"
|
||
|
"github.com/mrunalp/fileutils"
|
||
|
"github.com/opencontainers/runc/libcontainer/cgroups"
|
||
|
+ "github.com/opencontainers/runc/libcontainer/cgroups/fs2"
|
||
|
"github.com/opencontainers/runc/libcontainer/configs"
|
||
|
"github.com/opencontainers/runc/libcontainer/devices"
|
||
|
"github.com/opencontainers/runc/libcontainer/system"
|
||
|
@@ -295,17 +296,18 @@ func mountCgroupV1(m *configs.Mount, c *mountConfig) error {
|
||
|
}
|
||
|
|
||
|
func mountCgroupV2(m *configs.Mount, c *mountConfig) error {
|
||
|
- cgroupPath, err := securejoin.SecureJoin(c.root, m.Destination)
|
||
|
+ dest, err := securejoin.SecureJoin(c.root, m.Destination)
|
||
|
if err != nil {
|
||
|
return err
|
||
|
}
|
||
|
- if err := os.MkdirAll(cgroupPath, 0755); err != nil {
|
||
|
+ if err := os.MkdirAll(dest, 0755); err != nil {
|
||
|
return err
|
||
|
}
|
||
|
- if err := unix.Mount(m.Source, cgroupPath, "cgroup2", uintptr(m.Flags), m.Data); err != nil {
|
||
|
+ if err := unix.Mount(m.Source, dest, "cgroup2", uintptr(m.Flags), m.Data); err != nil {
|
||
|
// when we are in UserNS but CgroupNS is not unshared, we cannot mount cgroup2 (#2158)
|
||
|
if err == unix.EPERM || err == unix.EBUSY {
|
||
|
- return unix.Mount("/sys/fs/cgroup", cgroupPath, "", uintptr(m.Flags)|unix.MS_BIND, "")
|
||
|
+ src := fs2.UnifiedMountpoint
|
||
|
+ return unix.Mount(src, dest, "", uintptr(m.Flags)|unix.MS_BIND, "")
|
||
|
}
|
||
|
return err
|
||
|
}
|
||
|
--
|
||
|
2.31.1
|
||
|
|