summaryrefslogtreecommitdiff
path: root/libpod
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
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')
-rw-r--r--libpod/runtime.go3
1 files changed, 0 insertions, 3 deletions
diff --git a/libpod/runtime.go b/libpod/runtime.go
index 52ce8062b..04d76a4e1 100644
--- a/libpod/runtime.go
+++ b/libpod/runtime.go
@@ -287,14 +287,11 @@ func defaultRuntimeConfig() (RuntimeConfig, error) {
},
ConmonPath: []string{
"/usr/libexec/podman/conmon",
- "/usr/libexec/crio/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/crio/bin/conmon",
},
ConmonEnvVars: []string{
"PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin",