From 1a48c426c931ab7c98233afbabb21b01276136ec Mon Sep 17 00:00:00 2001
From: baude <bbaude@redhat.com>
Date: Tue, 2 Jan 2018 09:37:30 -0600
Subject: Extend search path for conmon

Adding /usr/libexec/crio/conmon to the list of places to
look for conmon.

Signed-off-by: baude <bbaude@redhat.com>

Closes: #172
Approved by: rhatdan
---
 libpod/runtime.go | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'libpod')

diff --git a/libpod/runtime.go b/libpod/runtime.go
index 59d7f7e3c..cb1e8f531 100644
--- a/libpod/runtime.go
+++ b/libpod/runtime.go
@@ -63,7 +63,7 @@ var (
 		ImageDefaultTransport: DefaultTransport,
 		InMemoryState:         false,
 		RuntimePath:           "/usr/bin/runc",
-		ConmonPath:            "/usr/local/libexec/crio/conmon",
+		ConmonPath:            findConmonPath(),
 		ConmonEnvVars: []string{
 			"PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin",
 		},
@@ -79,6 +79,15 @@ var (
 	}
 )
 
+func findConmonPath() string {
+	path := "/usr/local/libexec/crio/conmon"
+	_, err := os.Stat(path)
+	if err != nil {
+		path = "/usr/libexec/crio/conmon"
+	}
+	return path
+}
+
 // NewRuntime creates a new container runtime
 // Options can be passed to override the default configuration for the runtime
 func NewRuntime(options ...RuntimeOption) (runtime *Runtime, err error) {
-- 
cgit v1.2.3-54-g00ecf