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

Merge pull request #3429 from cevich/strip_crio_conmon

Browse Source 
Remove refs to crio/conmon
This commit is contained in:
OpenShift Merge Robot
2019-06-27 03:05:33 +02:00
committed by GitHub
parent c06d9898f9 fc32439c29
commit 7705f99fe6
3 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libpod/runtime.go
View File

@ -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",