summaryrefslogtreecommitdiff
path: root/cmd/podman/libpodruntime/runtime.go
diff options
context:
space:
mode:
authorGiuseppe Scrivano <gscrivan@redhat.com>2019-03-05 11:46:47 +0100
committerGiuseppe Scrivano <gscrivan@redhat.com>2019-03-11 09:29:04 +0100
commite02393ba700907ae193190f7335d3f2ec83c442a (patch)
treeb9603c6fa65ed55e1bc746d777f5ce1896a62cf1 /cmd/podman/libpodruntime/runtime.go
parent349e6911497a95a6a8121524b56704fe680f2b09 (diff)
downloadpodman-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 'cmd/podman/libpodruntime/runtime.go')
-rw-r--r--cmd/podman/libpodruntime/runtime.go3
1 files changed, 3 insertions, 0 deletions
diff --git a/cmd/podman/libpodruntime/runtime.go b/cmd/podman/libpodruntime/runtime.go
index 2b96f0c20..3faea493c 100644
--- a/cmd/podman/libpodruntime/runtime.go
+++ b/cmd/podman/libpodruntime/runtime.go
@@ -86,6 +86,9 @@ func getRuntime(c *cliconfig.PodmanCommand, renumber bool) (*libpod.Runtime, err
if c.Flags().Changed("tmpdir") {
options = append(options, libpod.WithTmpDir(c.GlobalFlags.TmpDir))
}
+ if c.Flags().Changed("network-cmd-path") {
+ options = append(options, libpod.WithNetworkCmdPath(c.GlobalFlags.NetworkCmdPath))
+ }
if c.Flags().Changed("cgroup-manager") {
options = append(options, libpod.WithCgroupManager(c.GlobalFlags.CGroupManager))