diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-02-26 10:37:59 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-26 10:37:59 +0100 |
| commit | f9ef82ee7cf59deab6bf1b19e531fc02efe6a0d7 (patch) | |
| tree | d9340055efebc4ca9d755fd9bd08a62b600fdc7d | |
| parent | 993b3a17c58826365136f49d7760f8ac88e320b2 (diff) | |
| parent | 5b010ee58b1c9053fc9113d5a4dcb6d28c16798e (diff) | |
| download | podman-f9ef82ee7cf59deab6bf1b19e531fc02efe6a0d7.tar.gz podman-f9ef82ee7cf59deab6bf1b19e531fc02efe6a0d7.tar.bz2 podman-f9ef82ee7cf59deab6bf1b19e531fc02efe6a0d7.zip | |
Merge pull request #2362 from mheon/add_locks_to_config
Add num_locks to the default libpod config
| -rw-r--r-- | docs/libpod.conf.5.md | 5 | ||||
| -rw-r--r-- | libpod.conf | 6 |
2 files changed, 11 insertions, 0 deletions
diff --git a/docs/libpod.conf.5.md b/docs/libpod.conf.5.md index 0c11e2013..0836c45fa 100644 --- a/docs/libpod.conf.5.md +++ b/docs/libpod.conf.5.md @@ -82,6 +82,11 @@ libpod to manage containers. **label**="true|false" Indicates whether the containers should use label separation. +**num_locks**="" + Number of locks available for containers and pods. Each created container or pod consumes one lock. + The default number available is 2048. + If this is changed, a lock renumbering must be performed, using the `podman system renumber` command. + ## FILES `/usr/share/containers/libpod.conf`, default libpod configuration path diff --git a/libpod.conf b/libpod.conf index c4e7dc628..8d6158ed5 100644 --- a/libpod.conf +++ b/libpod.conf @@ -88,6 +88,12 @@ pause_command = "/pause" # Default libpod support for container labeling # label=true +# Number of locks available for containers and pods. +# If this is changed, a lock renumber must be performed (e.g. with the +# 'podman system renumber' command). +num_locks = 2048 + +# Default OCI runtime runtime = "runc" # Paths to look for a valid OCI runtime (runc, runv, etc) |