From 00a7d2067e5e1a35091167b6d52e76024c977c08 Mon Sep 17 00:00:00 2001 From: Jamie Bliss Date: Fri, 21 Jun 2019 13:44:46 -0400 Subject: Add /usr/local/{s,}bin to conmon paths This is one of the default installation paths in conmon Signed-off-by: Jamie Bliss --- libpod.conf | 2 ++ 1 file changed, 2 insertions(+) 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" ] -- cgit v1.2.3-54-g00ecf From e2b0587c210ee71a7d2043100e52e23e0f3ec4c0 Mon Sep 17 00:00:00 2001 From: Jamie Bliss Date: Fri, 21 Jun 2019 14:38:29 -0400 Subject: runtime.go: Add /usr/local/{s,}bin Signed-off-by: Jamie Bliss --- libpod/runtime.go | 2 ++ 1 file changed, 2 insertions(+) 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{ -- cgit v1.2.3-54-g00ecf