summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorDaniel J Walsh <dwalsh@redhat.com>2019-04-13 06:12:11 -0400
committerDaniel J Walsh <dwalsh@redhat.com>2019-04-18 10:59:39 -0400
commit615a9e9f78eee0038b8803eb1223541fe28c6e16 (patch)
tree9f38158e62858fbead53817418a7150567dd17ec /docs
parent4d45f5180f778bf3a298bf061ca2c0dba0d4bfad (diff)
downloadpodman-615a9e9f78eee0038b8803eb1223541fe28c6e16.tar.gz
podman-615a9e9f78eee0038b8803eb1223541fe28c6e16.tar.bz2
podman-615a9e9f78eee0038b8803eb1223541fe28c6e16.zip
Internal names do not match external names
We refer to the pause_image and pause_container in the libpod.conf description, but internally we had infra_image and infra_container. This means it the user made changes to the conf, it would not effect the actual tool using libpod. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
Diffstat (limited to 'docs')
-rw-r--r--docs/libpod.conf.5.md10
1 files changed, 5 insertions, 5 deletions
diff --git a/docs/libpod.conf.5.md b/docs/libpod.conf.5.md
index 777edeacb..4abbcd8b0 100644
--- a/docs/libpod.conf.5.md
+++ b/docs/libpod.conf.5.md
@@ -65,13 +65,13 @@ libpod to manage containers.
**cni_plugin_dir**=""
Directories where CNI plugin binaries may be located
-**pause_image** = ""
- Pause container image name for pod pause containers. When running a pod, we
- start a `pause` processes in a container to hold open the namespaces associated with the
+**infra_image** = ""
+ Infra (pause) container image name for pod infra containers. When running a pod, we
+ start a `pause` process in a container to hold open the namespaces associated with the
pod. This container and process, basically sleep/pause for the lifetime of the pod.
-**pause_command**=""
- Command to run the pause container
+**infra_command**=""
+ Command to run the infra container
**namespace**=""
Default libpod namespace. If libpod is joined to a namespace, it will see only containers and pods