From c78d3769f13946f70fda1f642ce5a3907035fa21 Mon Sep 17 00:00:00 2001
From: baude <bbaude@redhat.com>
Date: Wed, 3 Jan 2018 12:39:35 -0600
Subject: Remove kpod handling of conmon

We don't want libkpod overrides for conmon's path to misdirect
the already set path for conmon from libpod.

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

Closes: #181
Approved by: baude
---
 libkpod/config.go | 2 --
 1 file changed, 2 deletions(-)

(limited to 'libkpod')

diff --git a/libkpod/config.go b/libkpod/config.go
index 15da7e482..9713e4bd7 100644
--- a/libkpod/config.go
+++ b/libkpod/config.go
@@ -12,7 +12,6 @@ import (
 const (
 	crioRoot            = "/var/lib/containers/storage"
 	crioRunRoot         = "/var/run/containers/storage"
-	conmonPath          = "/usr/local/libexec/crio/conmon"
 	pauseImage          = "kubernetes/pause"
 	pauseCommand        = "/pause"
 	defaultTransport    = "docker://"
@@ -278,7 +277,6 @@ func DefaultConfig() *Config {
 			RuntimeUntrustedWorkload: "",
 			DefaultWorkloadTrust:     "trusted",
 
-			Conmon: conmonPath,
 			ConmonEnv: []string{
 				"PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin",
 			},
-- 
cgit v1.2.3-54-g00ecf