summaryrefslogtreecommitdiff
path: root/libpod/oci_internal_linux.go
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2019-08-05 14:26:04 +0200
committerGitHub <noreply@github.com>2019-08-05 14:26:04 +0200
commite2f38cdaa41ddc711cce40e00dab9c8457d2e830 (patch)
tree2658cb33c3be5554f8a8da5c3de0b658c41dbc10 /libpod/oci_internal_linux.go
parentb609de2e3dc60df4179d41a54e359a8722dbd3ff (diff)
parent80dcd4bebcdc8e280f6b43228561d09c194c328b (diff)
downloadpodman-e2f38cdaa41ddc711cce40e00dab9c8457d2e830.tar.gz
podman-e2f38cdaa41ddc711cce40e00dab9c8457d2e830.tar.bz2
podman-e2f38cdaa41ddc711cce40e00dab9c8457d2e830.zip
Merge pull request #3310 from gabibeyer/rootlessKata
rootless: Rearrange setup of rootless containers ***CIRRUS: TEST IMAGES***
Diffstat (limited to 'libpod/oci_internal_linux.go')
-rw-r--r--libpod/oci_internal_linux.go12
1 files changed, 9 insertions, 3 deletions
diff --git a/libpod/oci_internal_linux.go b/libpod/oci_internal_linux.go
index 52cebefab..28e4b5b82 100644
--- a/libpod/oci_internal_linux.go
+++ b/libpod/oci_internal_linux.go
@@ -130,10 +130,16 @@ func (r *OCIRuntime) createOCIContainer(ctr *Container, restoreOptions *Containe
}
if ctr.config.NetMode.IsSlirp4netns() {
- ctr.rootlessSlirpSyncR, ctr.rootlessSlirpSyncW, err = os.Pipe()
- if err != nil {
- return errors.Wrapf(err, "failed to create rootless network sync pipe")
+ 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)
}
+
// Leak one end in conmon, the other one will be leaked into slirp4netns
cmd.ExtraFiles = append(cmd.ExtraFiles, ctr.rootlessSlirpSyncW)
}