Extend search path for conmon
Adding /usr/libexec/crio/conmon to the list of places to
look for conmon.
Closes:
Approved by: rhatdan
@@ -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) {
