mirror of
https://github.com/containers/podman.git
synced 2025-05-28 13:40:33 +08:00
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>
This commit is contained in:
@ -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
|
||||
|
@ -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",
|
||||
|
@ -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
|
||||
}
|
||||
|
Reference in New Issue
Block a user