opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-05-29 22:46:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove refs to crio/conmon

Browse Source 
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>
This commit is contained in:
Chris Evich
2019-06-25 15:06:15 -04:00
parent 21978c9908
commit fc32439c29
3 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
libpod.conf
View File

@ -7,15 +7,12 @@ image_default_transport = "docker://"
# Paths to look for the Conmon container manager binary # Paths to look for the Conmon container manager binary
conmon_path = [ conmon_path = [
"/usr/libexec/podman/conmon", "/usr/libexec/podman/conmon",
"/usr/libexec/crio/conmon", "/usr/local/libexec/podman/conmon",
"/usr/local/lib/podman/conmon", "/usr/local/lib/podman/conmon",
"/usr/local/libexec/crio/conmon",
"/usr/bin/conmon", "/usr/bin/conmon",
"/usr/sbin/conmon", "/usr/sbin/conmon",
"/usr/local/bin/conmon", "/usr/local/bin/conmon",
"/usr/local/sbin/conmon", "/usr/local/sbin/conmon"
"/usr/lib/podman/bin/conmon",
"/usr/lib/crio/bin/conmon"
] ]
# Environment variables to pass into conmon # Environment variables to pass into conmon

3
libpod/runtime.go
View File

@ -287,14 +287,11 @@ func defaultRuntimeConfig() (RuntimeConfig, error) {
}, },
ConmonPath: []string{ ConmonPath: []string{
"/usr/libexec/podman/conmon", "/usr/libexec/podman/conmon",
"/usr/libexec/crio/conmon",
"/usr/local/lib/podman/conmon", "/usr/local/lib/podman/conmon",
"/usr/local/libexec/crio/conmon",
"/usr/bin/conmon", "/usr/bin/conmon",
"/usr/sbin/conmon", "/usr/sbin/conmon",
"/usr/local/bin/conmon", "/usr/local/bin/conmon",
"/usr/local/sbin/conmon", "/usr/local/sbin/conmon",
"/usr/lib/crio/bin/conmon",
}, },
ConmonEnvVars: []string{ ConmonEnvVars: []string{
"PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin", "PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin",

2
test/e2e/common_test.go
View File

@ -195,7 +195,7 @@ func PodmanTestCreateUtil(tempDir string, remote bool) *PodmanTestIntegration {
} }
} }
conmonBinary := filepath.Join("/usr/libexec/podman/conmon") conmonBinary := filepath.Join("/usr/libexec/podman/conmon")
altConmonBinary := "/usr/libexec/crio/conmon" altConmonBinary := "/usr/bin/conmon"
if _, err := os.Stat(conmonBinary); os.IsNotExist(err) { if _, err := os.Stat(conmonBinary); os.IsNotExist(err) {
conmonBinary = altConmonBinary conmonBinary = altConmonBinary
} }