diff options
| -rw-r--r-- | libkpod/config.go | 2 | ||||
| -rw-r--r-- | libpod/options.go | 7 |
2 files changed, 4 insertions, 5 deletions
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", }, 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 } } |