summaryrefslogtreecommitdiff
path: root/libpod.conf
diff options
context:
space:
mode:
Diffstat (limited to 'libpod.conf')
-rw-r--r--libpod.conf17
1 files changed, 12 insertions, 5 deletions
diff --git a/libpod.conf b/libpod.conf
index 32f7a56ae..c92f60a10 100644
--- a/libpod.conf
+++ b/libpod.conf
@@ -7,15 +7,12 @@ image_default_transport = "docker://"
# Paths to look for the Conmon container manager binary
conmon_path = [
"/usr/libexec/podman/conmon",
- "/usr/libexec/crio/conmon",
+ "/usr/local/libexec/podman/conmon",
"/usr/local/lib/podman/conmon",
- "/usr/local/libexec/crio/conmon",
"/usr/bin/conmon",
"/usr/sbin/conmon",
"/usr/local/bin/conmon",
- "/usr/local/sbin/conmon",
- "/usr/lib/podman/bin/conmon",
- "/usr/lib/crio/bin/conmon"
+ "/usr/local/sbin/conmon"
]
# Environment variables to pass into conmon
@@ -90,6 +87,9 @@ infra_command = "/pause"
# Default libpod support for container labeling
# label=true
+# The locking mechanism to use
+lock_type = "shm"
+
# 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).
@@ -105,6 +105,13 @@ num_locks = 2048
# are `journald` or `file`.
# events_logger = "journald"
+# Specify the keys sequence used to detach a container.
+# Format is a single character [a-Z] or a comma separated sequence of
+# `ctrl-<value>`, where `<value>` is one of:
+# `a-z`, `@`, `^`, `[`, `\`, `]`, `^` or `_`
+#
+# detach_keys = "ctrl-p,ctrl-q"
+
# Default OCI runtime
runtime = "runc"