opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-23 10:38:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3399 from astronouth7303/patch-1

Browse Source 
Add /usr/local/{s,}bin to conmon paths
This commit is contained in:
OpenShift Merge Robot
2019-06-22 12:18:06 +02:00
committed by GitHub
parent ddba0e6964 e2b0587c21
commit 5787f88042
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libpod.conf
View File

@ -12,6 +12,8 @@ conmon_path = [
"/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"
]

2
libpod/runtime.go
View File

@ -291,6 +291,8 @@ func defaultRuntimeConfig() (RuntimeConfig, error) {
"/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{