diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-08-06 18:17:55 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-06 18:17:55 +0200 |
| commit | b5618d9e354a565fb8e472208c835a36373e4fbb (patch) | |
| tree | f755f4b52de94c38b432f23127d302b3d8c0a1a4 /libpod/oci_internal_linux.go | |
| parent | 37b40e9acdae6bfa79d53928361540754417cdc6 (diff) | |
| parent | 97b84dedf3806a9e87c04ccfb51212992785d2c8 (diff) | |
| download | podman-b5618d9e354a565fb8e472208c835a36373e4fbb.tar.gz podman-b5618d9e354a565fb8e472208c835a36373e4fbb.tar.bz2 podman-b5618d9e354a565fb8e472208c835a36373e4fbb.zip | |
Merge pull request #3736 from baude/revert
Revert "rootless: Rearrange setup of rootless containers"
Diffstat (limited to 'libpod/oci_internal_linux.go')
| -rw-r--r-- | libpod/oci_internal_linux.go | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/libpod/oci_internal_linux.go b/libpod/oci_internal_linux.go index 28e4b5b82..52cebefab 100644 --- a/libpod/oci_internal_linux.go +++ b/libpod/oci_internal_linux.go @@ -130,16 +130,10 @@ func (r *OCIRuntime) createOCIContainer(ctr *Container, restoreOptions *Containe } if ctr.config.NetMode.IsSlirp4netns() { - if ctr.config.PostConfigureNetNS { - ctr.rootlessSlirpSyncR, ctr.rootlessSlirpSyncW, err = os.Pipe() - if err != nil { - return errors.Wrapf(err, "failed to create rootless network sync pipe") - } - } else { - defer errorhandling.CloseQuiet(ctr.rootlessSlirpSyncR) - defer errorhandling.CloseQuiet(ctr.rootlessSlirpSyncW) + ctr.rootlessSlirpSyncR, ctr.rootlessSlirpSyncW, err = os.Pipe() + if err != nil { + return errors.Wrapf(err, "failed to create rootless network sync pipe") } - // Leak one end in conmon, the other one will be leaked into slirp4netns cmd.ExtraFiles = append(cmd.ExtraFiles, ctr.rootlessSlirpSyncW) } |