diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-06-27 03:05:33 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-27 03:05:33 +0200 |
| commit | 7705f99fe6cabe5028483e623b21177e25cc5d6f (patch) | |
| tree | b2c156d17b74ef6a265e39cd157dc6c052532049 /libpod.conf | |
| parent | c06d9898f91fb2dcddff4f9b65df13c2f158cfd0 (diff) | |
| parent | fc32439c298a107bd31f64fb7b6d396bce525e57 (diff) | |
| download | podman-7705f99fe6cabe5028483e623b21177e25cc5d6f.tar.gz podman-7705f99fe6cabe5028483e623b21177e25cc5d6f.tar.bz2 podman-7705f99fe6cabe5028483e623b21177e25cc5d6f.zip | |
Merge pull request #3429 from cevich/strip_crio_conmon
Remove refs to crio/conmon
Diffstat (limited to 'libpod.conf')
| -rw-r--r-- | libpod.conf | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/libpod.conf b/libpod.conf index 32f7a56ae..2b5df0e66 100644 --- a/libpod.conf +++ b/libpod.conf @@ -7,15 +7,12 @@ image_default_transport = "docker://" # Paths to look for the Conmon container manager binary conmon_path = [ "/usr/libexec/podman/conmon", - "/usr/libexec/crio/conmon", + "/usr/local/libexec/podman/conmon", "/usr/local/lib/podman/conmon", - "/usr/local/libexec/crio/conmon", "/usr/bin/conmon", "/usr/sbin/conmon", "/usr/local/bin/conmon", - "/usr/local/sbin/conmon", - "/usr/lib/podman/bin/conmon", - "/usr/lib/crio/bin/conmon" + "/usr/local/sbin/conmon" ] # Environment variables to pass into conmon |