summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Heon <mheon@redhat.com>2018-03-12 10:53:26 -0400
committerAtomic Bot <atomic-devel@projectatomic.io>2018-03-14 14:54:43 +0000
commit392d998143174644920e9141c615b15450d5bb01 (patch)
tree715e84b73d923c97ac6b008a84cfe917faa9b643
parent62b93d172399c20753914d7d91d02ee105a77f6d (diff)
downloadpodman-392d998143174644920e9141c615b15450d5bb01.tar.gz
podman-392d998143174644920e9141c615b15450d5bb01.tar.bz2
podman-392d998143174644920e9141c615b15450d5bb01.zip
Add new default location for conmon
This will allow overriding the CRI-O version of conmon in our packages (and elsewhere, if we need to). Signed-off-by: Matthew Heon <mheon@redhat.com> Closes: #474 Approved by: rhatdan
-rw-r--r--libpod.conf1
1 files changed, 1 insertions, 0 deletions
diff --git a/libpod.conf b/libpod.conf
index 1a793b12b..7067a102b 100644
--- a/libpod.conf
+++ b/libpod.conf
@@ -15,6 +15,7 @@ runtime_path = [
# Paths to look for the Conmon container manager binary
conmon_path = [
+ "/usr/libexec/podman/conmon",
"/usr/libexec/crio/conmon",
"/usr/local/libexec/crio/conmon",
"/usr/bin/conmon",