summaryrefslogtreecommitdiff
path: root/libpod.conf
diff options
context:
space:
mode:
authorChris Evich <cevich@redhat.com>2019-06-25 15:06:15 -0400
committerChris Evich <cevich@redhat.com>2019-06-26 12:44:22 -0400
commitfc32439c298a107bd31f64fb7b6d396bce525e57 (patch)
tree364bb5640847277068a35bf3dd3123c02ad28f5f /libpod.conf
parent21978c99088c04bcc847eb12f829876708c0b9e2 (diff)
downloadpodman-fc32439c298a107bd31f64fb7b6d396bce525e57.tar.gz
podman-fc32439c298a107bd31f64fb7b6d396bce525e57.tar.bz2
podman-fc32439c298a107bd31f64fb7b6d396bce525e57.zip
Remove refs to crio/conmon
Conmon has moved out of cri-o and into it's own dedicated repository. This commit updates configuration and definitions which referenced the old cri-o based paths. Signed-off-by: Chris Evich <cevich@redhat.com>
Diffstat (limited to 'libpod.conf')
-rw-r--r--libpod.conf7
1 files changed, 2 insertions, 5 deletions
diff --git a/libpod.conf b/libpod.conf
index 32f7a56ae..2b5df0e66 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