diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-03-11 07:56:50 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-11 07:56:50 -0700 |
| commit | 8656d2d887b32c320b4dd453314ce95cd9cad6a5 (patch) | |
| tree | d00e9aa4c6b4eb465d880c1fdd90bb13ac2210a1 /libpod/networking_linux.go | |
| parent | 9b42577c322b74906d4dfa64926d9f187e2e2976 (diff) | |
| parent | e02393ba700907ae193190f7335d3f2ec83c442a (diff) | |
| download | podman-8656d2d887b32c320b4dd453314ce95cd9cad6a5.tar.gz podman-8656d2d887b32c320b4dd453314ce95cd9cad6a5.tar.bz2 podman-8656d2d887b32c320b4dd453314ce95cd9cad6a5.zip | |
Merge pull request #2538 from giuseppe/slirp4netns-path
libpod: allow to configure path to the slirp4netns binary
Diffstat (limited to 'libpod/networking_linux.go')
| -rw-r--r-- | libpod/networking_linux.go | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/libpod/networking_linux.go b/libpod/networking_linux.go index f9caf26d1..80d7d8213 100644 --- a/libpod/networking_linux.go +++ b/libpod/networking_linux.go @@ -139,10 +139,15 @@ func (r *Runtime) setupRootlessNetNS(ctr *Container) (err error) { defer ctr.rootlessSlirpSyncR.Close() defer ctr.rootlessSlirpSyncW.Close() - path, err := exec.LookPath("slirp4netns") - if err != nil { - logrus.Errorf("could not find slirp4netns, the network namespace won't be configured: %v", err) - return nil + path := r.config.NetworkCmdPath + + if path == "" { + var err error + path, err = exec.LookPath("slirp4netns") + if err != nil { + logrus.Errorf("could not find slirp4netns, the network namespace won't be configured: %v", err) + return nil + } } syncR, syncW, err := os.Pipe() |