mirror of
https://github.com/containers/podman.git
synced 2025-06-22 18:08:11 +08:00
Merge pull request #14764 from cdoern/cgroup
limit cgroupfs when rootless
This commit is contained in:
@ -78,6 +78,8 @@ func (r *Runtime) NewPod(ctx context.Context, p specgen.PodSpecGenerator, option
|
||||
pod.state.CgroupPath = filepath.Join(pod.config.CgroupParent, pod.ID())
|
||||
if p.InfraContainerSpec != nil {
|
||||
p.InfraContainerSpec.CgroupParent = pod.state.CgroupPath
|
||||
// cgroupfs + rootless = permission denied when creating the cgroup.
|
||||
if !rootless.IsRootless() {
|
||||
res, err := GetLimits(p.InfraContainerSpec.ResourceLimits)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
@ -97,6 +99,7 @@ func (r *Runtime) NewPod(ctx context.Context, p specgen.PodSpecGenerator, option
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
case config.SystemdCgroupsManager:
|
||||
if pod.config.CgroupParent == "" {
|
||||
if rootless.IsRootless() {
|
||||
|
Reference in New Issue
Block a user