summaryrefslogtreecommitdiff
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
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
-rw-r--r--libpod.conf7
-rw-r--r--libpod/runtime.go3
-rw-r--r--test/e2e/common_test.go2
3 files changed, 3 insertions, 9 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
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",
diff --git a/test/e2e/common_test.go b/test/e2e/common_test.go
index 8b6eab892..c3a37236b 100644
--- a/test/e2e/common_test.go
+++ b/test/e2e/common_test.go
@@ -195,7 +195,7 @@ func PodmanTestCreateUtil(tempDir string, remote bool) *PodmanTestIntegration {
}
}
conmonBinary := filepath.Join("/usr/libexec/podman/conmon")
- altConmonBinary := "/usr/libexec/crio/conmon"
+ altConmonBinary := "/usr/bin/conmon"
if _, err := os.Stat(conmonBinary); os.IsNotExist(err) {
conmonBinary = altConmonBinary
}