diff options
| author | Giuseppe Scrivano <gscrivan@redhat.com> | 2019-03-05 11:46:47 +0100 |
|---|---|---|
| committer | Giuseppe Scrivano <gscrivan@redhat.com> | 2019-03-11 09:29:04 +0100 |
| commit | e02393ba700907ae193190f7335d3f2ec83c442a (patch) | |
| tree | b9603c6fa65ed55e1bc746d777f5ce1896a62cf1 /libpod/networking_linux.go | |
| parent | 349e6911497a95a6a8121524b56704fe680f2b09 (diff) | |
| download | podman-e02393ba700907ae193190f7335d3f2ec83c442a.tar.gz podman-e02393ba700907ae193190f7335d3f2ec83c442a.tar.bz2 podman-e02393ba700907ae193190f7335d3f2ec83c442a.zip | |
libpod: allow to configure path to the network-cmd binary
allow to configure the path to the network-cmd binary, either via an
option flag --network-cmd-path or through the libpod.conf
configuration file.
This is currently used to customize the path to the slirp4netns
binary.
Closes: https://github.com/containers/libpod/issues/2506
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
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() |