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 /docs | |
| 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 'docs')
| -rw-r--r-- | docs/libpod.conf.5.md | 4 | ||||
| -rw-r--r-- | docs/podman.1.md | 3 |
2 files changed, 7 insertions, 0 deletions
diff --git a/docs/libpod.conf.5.md b/docs/libpod.conf.5.md index 9a19e1224..777edeacb 100644 --- a/docs/libpod.conf.5.md +++ b/docs/libpod.conf.5.md @@ -91,6 +91,10 @@ libpod to manage containers. Directory where named volumes will be created in using the default volume driver. By default this will be configured relative to where containers/storage stores containers. +**network_cmd_path**="" + Path to the command binary to use for setting up a network. It is currently only used for setting up + a slirp4netns network. If "" is used then the binary is looked up using the $PATH environment variable. + ## FILES `/usr/share/containers/libpod.conf`, default libpod configuration path diff --git a/docs/podman.1.md b/docs/podman.1.md index 5c930995c..0182690d0 100644 --- a/docs/podman.1.md +++ b/docs/podman.1.md @@ -72,6 +72,9 @@ Default state dir is configured in /etc/containers/storage.conf. Name of the OCI runtime as specified in libpod.conf or absolute path to the OCI compatible binary used to run containers. +**--network-cmd-path**=**path** +Path to the command binary to use for setting up a network. It is currently only used for setting up a slirp4netns network. If "" is used then the binary is looked up using the $PATH environment variable. + **--storage-driver**=**value** Storage driver. The default storage driver for UID 0 is configured in /etc/containers/storage.conf (`$HOME/.config/containers/storage.conf` in rootless mode), and is *vfs* for non-root users when *fuse-overlayfs* is not available. The `STORAGE_DRIVER` environment variable overrides the default. The --storage-driver specified driver overrides all. |