summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2018-11-08 14:06:02 -0800
committerGitHub <noreply@github.com>2018-11-08 14:06:02 -0800
commit3a4c4bad6798dce7ce9ea85fbd53fe48daf98084 (patch)
treede0cdca600de5ba642f00a7627bc5a7ab0d1df59
parentfa8cc1a94281aac1c52952a002f9c3dd31d91197 (diff)
parent2fb6ef9f407d7933c4dd6de7908bf53104e99e74 (diff)
downloadpodman-3a4c4bad6798dce7ce9ea85fbd53fe48daf98084.tar.gz
podman-3a4c4bad6798dce7ce9ea85fbd53fe48daf98084.tar.bz2
podman-3a4c4bad6798dce7ce9ea85fbd53fe48daf98084.zip
Merge pull request #1790 from isimluk/beware-of-goroutine-locals
Do not hide errors when creating container with UserNSRoot
-rw-r--r--libpod/oci_linux.go3
1 files changed, 2 insertions, 1 deletions
diff --git a/libpod/oci_linux.go b/libpod/oci_linux.go
index 0447670b3..e6b7cbe4f 100644
--- a/libpod/oci_linux.go
+++ b/libpod/oci_linux.go
@@ -74,7 +74,8 @@ func (r *OCIRuntime) createContainer(ctr *Container, cgroupParent string, restor
defer wg.Done()
runtime.LockOSThread()
- fd, err := os.Open(fmt.Sprintf("/proc/%d/task/%d/ns/mnt", os.Getpid(), unix.Gettid()))
+ var fd *os.File
+ fd, err = os.Open(fmt.Sprintf("/proc/%d/task/%d/ns/mnt", os.Getpid(), unix.Gettid()))
if err != nil {
return
}