summaryrefslogtreecommitdiff
path: root/libpod/runtime_pod_linux.go
diff options
context:
space:
mode:
authorDaniel J Walsh <dwalsh@redhat.com>2022-01-13 14:51:06 -0500
committerDaniel J Walsh <dwalsh@redhat.com>2022-01-14 12:30:20 -0500
commita15dfb3648b903fa61c299347b315ad8302d8e15 (patch)
tree50ae881b2550d946153a0e4b137cc1738b4da44a /libpod/runtime_pod_linux.go
parentec2b213ab611cb197e86c45d03fb10af667ad95c (diff)
downloadpodman-a15dfb3648b903fa61c299347b315ad8302d8e15.tar.gz
podman-a15dfb3648b903fa61c299347b315ad8302d8e15.tar.bz2
podman-a15dfb3648b903fa61c299347b315ad8302d8e15.zip
Standardize on capatalized Cgroups
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
Diffstat (limited to 'libpod/runtime_pod_linux.go')
-rw-r--r--libpod/runtime_pod_linux.go12
1 files changed, 6 insertions, 6 deletions
diff --git a/libpod/runtime_pod_linux.go b/libpod/runtime_pod_linux.go
index ee59cd8c3..ea3eb53c4 100644
--- a/libpod/runtime_pod_linux.go
+++ b/libpod/runtime_pod_linux.go
@@ -61,7 +61,7 @@ func (r *Runtime) NewPod(ctx context.Context, p specgen.PodSpecGenerator, option
pod.valid = true
- // Check CGroup parent sanity, and set it if it was not set
+ // Check Cgroup parent sanity, and set it if it was not set
switch r.config.Engine.CgroupManager {
case config.CgroupfsCgroupsManager:
canUseCgroup := !rootless.IsRootless() || isRootlessCgroupSet(pod.config.CgroupParent)
@@ -105,7 +105,7 @@ func (r *Runtime) NewPod(ctx context.Context, p specgen.PodSpecGenerator, option
}
}
default:
- return nil, errors.Wrapf(define.ErrInvalidArg, "unsupported CGroup manager: %s - cannot validate cgroup parent", r.config.Engine.CgroupManager)
+ return nil, errors.Wrapf(define.ErrInvalidArg, "unsupported Cgroup manager: %s - cannot validate cgroup parent", r.config.Engine.CgroupManager)
}
if pod.config.UsePodCgroup {
@@ -226,12 +226,12 @@ func (r *Runtime) removePod(ctx context.Context, p *Pod, removeCtrs, force bool,
}
// We're going to be removing containers.
- // If we are CGroupfs cgroup driver, to avoid races, we need to hit
- // the pod and conmon CGroups with a PID limit to prevent them from
+ // If we are Cgroupfs cgroup driver, to avoid races, we need to hit
+ // the pod and conmon Cgroups with a PID limit to prevent them from
// spawning any further processes (particularly cleanup processes) which
- // would prevent removing the CGroups.
+ // would prevent removing the Cgroups.
if p.runtime.config.Engine.CgroupManager == config.CgroupfsCgroupsManager {
- // Get the conmon CGroup
+ // Get the conmon Cgroup
conmonCgroupPath := filepath.Join(p.state.CgroupPath, "conmon")
conmonCgroup, err := cgroups.Load(conmonCgroupPath)
if err != nil && err != cgroups.ErrCgroupDeleted && err != cgroups.ErrCgroupV1Rootless {