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
---
 libpod/options.go | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'libpod')

diff --git a/libpod/options.go b/libpod/options.go
index 70db3bdae..0ddbeae55 100644
--- a/libpod/options.go
+++ b/libpod/options.go
@@ -134,9 +134,10 @@ func WithConmonPath(path string) RuntimeOption {
 		if rt.valid {
 			return ErrRuntimeFinalized
 		}
-
-		rt.config.ConmonPath = path
-
+		// TODO Once libkpod is eliminated, "" should throw an error
+		if path != "" {
+			rt.config.ConmonPath = path
+		}
 		return nil
 	}
 }
-- 
cgit v1.2.3-54-g00ecf