diff options
| author | Chris Evich <cevich@redhat.com> | 2019-06-25 15:06:15 -0400 |
|---|---|---|
| committer | Chris Evich <cevich@redhat.com> | 2019-06-26 12:44:22 -0400 |
| commit | fc32439c298a107bd31f64fb7b6d396bce525e57 (patch) | |
| tree | 364bb5640847277068a35bf3dd3123c02ad28f5f | |
| parent | 21978c99088c04bcc847eb12f829876708c0b9e2 (diff) | |
| download | podman-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>
| -rw-r--r-- | libpod.conf | 7 | ||||
| -rw-r--r-- | libpod/runtime.go | 3 | ||||
| -rw-r--r-- | test/e2e/common_test.go | 2 |
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 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", 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 } |