github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Don't evacuate the root cgroup when rootless 

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
pull/4106/head
Brad Davidson 2021-10-01 11:13:25 -07:00 committed by Brad Davidson
parent 3615e94d68
commit 27bebd11a5
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkg/cli/cmds/init_linux.go
View File

@ -7,6 +7,7 @@ import (
"os/signal"
"syscall"
"github.com/containerd/containerd/sys"
"github.com/erikdubbelboer/gspt"
"github.com/pkg/errors"
"github.com/rancher/k3s/pkg/version"
@ -20,10 +21,12 @@ func HandleInit() error {
return nil
}
// The root cgroup has to be empty to enable subtree_control, so evacuate it by placing
// ourselves in the init cgroup.
if err := cgrouputil.EvacuateCgroup2("init"); err != nil {
return errors.Wrap(err, "failed to evacuate root cgroup")
if !sys.RunningInUserNS() {
// The root cgroup has to be empty to enable subtree_control, so evacuate it by placing
// ourselves in the init cgroup.
if err := cgrouputil.EvacuateCgroup2("init"); err != nil {
return errors.Wrap(err, "failed to evacuate root cgroup")
}
}
pwd, err := os.Getwd()