diff options
author | baude <bbaude@redhat.com> | 2018-01-03 12:39:35 -0600 |
---|---|---|
committer | Atomic Bot <atomic-devel@projectatomic.io> | 2018-01-03 20:10:15 +0000 |
commit | c78d3769f13946f70fda1f642ce5a3907035fa21 (patch) | |
tree | a002ffdabf29dcdb532920a1a762bb3d281ee7ea /libpod | |
parent | 00d38cb37958f3c636aa5837b8f01dfad891a0b5 (diff) | |
download | podman-c78d3769f13946f70fda1f642ce5a3907035fa21.tar.gz podman-c78d3769f13946f70fda1f642ce5a3907035fa21.tar.bz2 podman-c78d3769f13946f70fda1f642ce5a3907035fa21.zip |
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
Diffstat (limited to 'libpod')
-rw-r--r-- | libpod/options.go | 7 |
1 files changed, 4 insertions, 3 deletions
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 } } |