summaryrefslogtreecommitdiff
path: root/libpod/runtime.go
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2019-06-27 03:05:33 +0200
committerGitHub <noreply@github.com>2019-06-27 03:05:33 +0200
commit7705f99fe6cabe5028483e623b21177e25cc5d6f (patch)
treeb2c156d17b74ef6a265e39cd157dc6c052532049 /libpod/runtime.go
parentc06d9898f91fb2dcddff4f9b65df13c2f158cfd0 (diff)
parentfc32439c298a107bd31f64fb7b6d396bce525e57 (diff)
downloadpodman-7705f99fe6cabe5028483e623b21177e25cc5d6f.tar.gz
podman-7705f99fe6cabe5028483e623b21177e25cc5d6f.tar.bz2
podman-7705f99fe6cabe5028483e623b21177e25cc5d6f.zip
Merge pull request #3429 from cevich/strip_crio_conmon
Remove refs to crio/conmon
Diffstat (limited to 'libpod/runtime.go')
-rw-r--r--libpod/runtime.go3
1 files changed, 0 insertions, 3 deletions
diff --git a/libpod/runtime.go b/libpod/runtime.go
index 152af031a..97eb565cc 100644
--- a/libpod/runtime.go
+++ b/libpod/runtime.go
@@ -285,14 +285,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",