mirror of
https://github.com/containers/podman.git
synced 2025-10-16 18:53:19 +08:00
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
This commit is contained in:
@ -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",
|
||||
},
|
||||
|
@ -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
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user