diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2018-11-16 05:02:03 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-16 05:02:03 -0800 |
| commit | 39ef6d43d0b5a614228898180025835836673a8c (patch) | |
| tree | 3501ed854691f101996d67ea7bfd16cf37c2e709 /libpod/oci.go | |
| parent | 53c47b9061bcee28c1777c331ab6ede2a7e0dc37 (diff) | |
| parent | e93834576036ef0a5e1d5867e522d1d90a63d358 (diff) | |
| download | podman-39ef6d43d0b5a614228898180025835836673a8c.tar.gz podman-39ef6d43d0b5a614228898180025835836673a8c.tar.bz2 podman-39ef6d43d0b5a614228898180025835836673a8c.zip | |
Merge pull request #1756 from isimluk/update-dependent-metalinter
Update metalinter dependency
Diffstat (limited to 'libpod/oci.go')
| -rw-r--r-- | libpod/oci.go | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libpod/oci.go b/libpod/oci.go index 233bacfbb..71da830b5 100644 --- a/libpod/oci.go +++ b/libpod/oci.go @@ -350,7 +350,8 @@ func (r *OCIRuntime) createOCIContainer(ctr *Container, cgroupParent string, res // Set the label of the conmon process to be level :s0 // This will allow the container processes to talk to fifo-files // passed into the container by conmon - plabel, err := selinux.CurrentLabel() + var plabel string + plabel, err = selinux.CurrentLabel() if err != nil { childPipe.Close() return errors.Wrapf(err, "Failed to get current SELinux label") @@ -360,7 +361,7 @@ func (r *OCIRuntime) createOCIContainer(ctr *Container, cgroupParent string, res runtime.LockOSThread() if c["level"] != "s0" && c["level"] != "" { c["level"] = "s0" - if err := label.SetProcessLabel(c.Get()); err != nil { + if err = label.SetProcessLabel(c.Get()); err != nil { runtime.UnlockOSThread() return err } |