diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-01-13 21:03:21 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-13 21:03:21 +0100 |
| commit | 796ae87b1a3444557644944ddeb7cb37e303ef83 (patch) | |
| tree | 192bd260c0b35519fe45ecbc91d7212251d82495 /libpod/runtime_ctr.go | |
| parent | c1d93666d4b175be29a0ba229ee0b94d50765888 (diff) | |
| parent | 768c476ae3c1dbf37204f5769b43746358af899d (diff) | |
| download | podman-796ae87b1a3444557644944ddeb7cb37e303ef83.tar.gz podman-796ae87b1a3444557644944ddeb7cb37e303ef83.tar.bz2 podman-796ae87b1a3444557644944ddeb7cb37e303ef83.zip | |
Merge pull request #4850 from vrothberg/fix-linting
Fix linting
Diffstat (limited to 'libpod/runtime_ctr.go')
| -rw-r--r-- | libpod/runtime_ctr.go | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/libpod/runtime_ctr.go b/libpod/runtime_ctr.go index 51efc5996..de7cfd3b8 100644 --- a/libpod/runtime_ctr.go +++ b/libpod/runtime_ctr.go @@ -234,15 +234,16 @@ func (r *Runtime) setupContainer(ctx context.Context, ctr *Container) (c *Contai } case define.SystemdCgroupsManager: if ctr.config.CgroupParent == "" { - if pod != nil && pod.config.UsePodCgroup { + switch { + case pod != nil && pod.config.UsePodCgroup: podCgroup, err := pod.CgroupPath() if err != nil { return nil, errors.Wrapf(err, "error retrieving pod %s cgroup", pod.ID()) } ctr.config.CgroupParent = podCgroup - } else if rootless.IsRootless() { + case rootless.IsRootless(): ctr.config.CgroupParent = SystemdDefaultRootlessCgroupParent - } else { + default: ctr.config.CgroupParent = SystemdDefaultCgroupParent } } else if len(ctr.config.CgroupParent) < 6 || !strings.HasSuffix(path.Base(ctr.config.CgroupParent), ".slice") { @@ -361,10 +362,8 @@ func (r *Runtime) setupContainer(ctx context.Context, ctr *Container) (c *Contai if err := r.state.AddContainerToPod(pod, ctr); err != nil { return nil, err } - } else { - if err := r.state.AddContainer(ctr); err != nil { - return nil, err - } + } else if err := r.state.AddContainer(ctr); err != nil { + return nil, err } ctr.newContainerEvent(events.Create) return ctr, nil |