summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorSascha Grunert <sgrunert@suse.com>2019-07-30 13:24:02 +0200
committerSascha Grunert <sgrunert@suse.com>2019-08-01 08:32:25 +0200
commit7dfaef7766871e5fd914eb0373b26db29df5bb46 (patch)
tree8a321b2b5a98b90e6054b9027f3b7f4ea61474a0 /docs
parenta622f8d345b1853401de2e533e9fbf14ef169fa2 (diff)
downloadpodman-7dfaef7766871e5fd914eb0373b26db29df5bb46.tar.gz
podman-7dfaef7766871e5fd914eb0373b26db29df5bb46.tar.bz2
podman-7dfaef7766871e5fd914eb0373b26db29df5bb46.zip
Add runtime and conmon path discovery
The `$PATH` environment variable will now used as fallback if no valid runtime or conmon path matches. The debug logs has been updated to state the used executable. Signed-off-by: Sascha Grunert <sgrunert@suse.com>
Diffstat (limited to 'docs')
-rw-r--r--docs/libpod.conf.5.md4
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