diff options
author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-08-01 10:04:19 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-08-01 10:04:19 +0200 |
commit | ccf4ec295b9a144740b07a202432aa34a7cce3de (patch) | |
tree | 4859563846256c2a7f30b7637bfb4651f967f6fa /docs/libpod.conf.5.md | |
parent | 39de184b8bfb14954f77190f0e6127c1ddc363c0 (diff) | |
parent | 7dfaef7766871e5fd914eb0373b26db29df5bb46 (diff) | |
download | podman-ccf4ec295b9a144740b07a202432aa34a7cce3de.tar.gz podman-ccf4ec295b9a144740b07a202432aa34a7cce3de.tar.bz2 podman-ccf4ec295b9a144740b07a202432aa34a7cce3de.zip |
Merge pull request #3671 from openSUSE/runtime-path-discovery
Add runtime and conmon path discovery
Diffstat (limited to 'docs/libpod.conf.5.md')
-rw-r--r-- | docs/libpod.conf.5.md | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/libpod.conf.5.md b/docs/libpod.conf.5.md index 097d0764a..b4d562d94 100644 --- a/docs/libpod.conf.5.md +++ b/docs/libpod.conf.5.md @@ -16,10 +16,10 @@ libpod to manage containers. Default OCI runtime to use if nothing is specified in **runtimes** **runtimes** - For each OCI runtime, specify a list of paths to look for. The first one found is used. + For each OCI runtime, specify a list of paths to look for. The first one found is used. If the paths are empty or no valid path was found, then the `$PATH` environment variable will be used as the fallback. **conmon_path**="" - Paths to search for the Conmon container manager binary + Paths to search for the conmon container manager binary. If the paths are empty or no valid path was found, then the `$PATH` environment variable will be used as the fallback. **conmon_env_vars**="" Environment variables to pass into Conmon |