diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-10-31 22:39:01 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-31 22:39:01 +0100 |
| commit | 95b2fd6c273ded741614665644c431a1c7831a70 (patch) | |
| tree | e09c845896ba74942de8ec13e4404df393f374a5 /libpod/runtime_ctr.go | |
| parent | a15a20d3c5898017e1549028fd8960d421240918 (diff) | |
| parent | 28ad43940f3bfca3870a5450342c4b79c6a2f60f (diff) | |
| download | podman-95b2fd6c273ded741614665644c431a1c7831a70.tar.gz podman-95b2fd6c273ded741614665644c431a1c7831a70.tar.bz2 podman-95b2fd6c273ded741614665644c431a1c7831a70.zip | |
Merge pull request #4403 from mheon/cherrypick_163
Cherrypicks for v1.6.3 final
Diffstat (limited to 'libpod/runtime_ctr.go')
| -rw-r--r-- | libpod/runtime_ctr.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libpod/runtime_ctr.go b/libpod/runtime_ctr.go index 2b214d572..7069d3494 100644 --- a/libpod/runtime_ctr.go +++ b/libpod/runtime_ctr.go @@ -75,7 +75,7 @@ func (r *Runtime) initContainerVariables(rSpec *spec.Spec, config *ContainerConf if config == nil { ctr.config.ID = stringid.GenerateNonCryptoID() - ctr.config.ShmSize = DefaultShmSize + ctr.config.ShmSize = define.DefaultShmSize } else { // This is a restore from an imported checkpoint ctr.restoreFromCheckpoint = true @@ -215,7 +215,7 @@ func (r *Runtime) setupContainer(ctx context.Context, ctr *Container) (c *Contai // Only if we're actually configuring CGroups. if !ctr.config.NoCgroups { switch r.config.CgroupManager { - case CgroupfsCgroupsManager: + case define.CgroupfsCgroupsManager: if ctr.config.CgroupParent == "" { if pod != nil && pod.config.UsePodCgroup { podCgroup, err := pod.CgroupPath() @@ -232,7 +232,7 @@ func (r *Runtime) setupContainer(ctx context.Context, ctr *Container) (c *Contai } else if strings.HasSuffix(path.Base(ctr.config.CgroupParent), ".slice") { return nil, errors.Wrapf(define.ErrInvalidArg, "systemd slice received as cgroup parent when using cgroupfs") } - case SystemdCgroupsManager: + case define.SystemdCgroupsManager: if ctr.config.CgroupParent == "" { if pod != nil && pod.config.UsePodCgroup { podCgroup, err := pod.CgroupPath() |