diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-06-22 12:18:06 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-22 12:18:06 +0200 |
| commit | 5787f88042a891b877d6974d7ab9eb0b9889bd2d (patch) | |
| tree | 7af38bcca9a65b7dbe20fd37806ef9654f13ff81 | |
| parent | ddba0e6964e9d18330bf06158b9c91597b79dc8d (diff) | |
| parent | e2b0587c210ee71a7d2043100e52e23e0f3ec4c0 (diff) | |
| download | podman-5787f88042a891b877d6974d7ab9eb0b9889bd2d.tar.gz podman-5787f88042a891b877d6974d7ab9eb0b9889bd2d.tar.bz2 podman-5787f88042a891b877d6974d7ab9eb0b9889bd2d.zip | |
Merge pull request #3399 from astronouth7303/patch-1
Add /usr/local/{s,}bin to conmon paths
| -rw-r--r-- | libpod.conf | 2 | ||||
| -rw-r--r-- | libpod/runtime.go | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/libpod.conf b/libpod.conf index 45e955c36..6fbadeee5 100644 --- a/libpod.conf +++ b/libpod.conf @@ -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" ] diff --git a/libpod/runtime.go b/libpod/runtime.go index d4d34242c..78fa22ec8 100644 --- a/libpod/runtime.go +++ b/libpod/runtime.go @@ -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{ |