diff options
| author | Daniel J Walsh <dwalsh@redhat.com> | 2018-06-01 12:58:51 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-01 12:58:51 -0400 |
| commit | 10d440a1c898aac84198c9c34d48d0cea9085f68 (patch) | |
| tree | 9c347ad382a76bfd0f9f728de43932954a826f59 | |
| parent | 3f29e3e88110fd1a1c0b7d2058aa2c89dbb89c40 (diff) | |
| parent | 46e0cf0ef8fd65740024fe7e98a69462be2e4e73 (diff) | |
| download | podman-10d440a1c898aac84198c9c34d48d0cea9085f68.tar.gz podman-10d440a1c898aac84198c9c34d48d0cea9085f68.tar.bz2 podman-10d440a1c898aac84198c9c34d48d0cea9085f68.zip | |
Merge pull request #872 from giuseppe/add-usr-libexec-podman-conmon
runtime: add /usr/libexec/podman/conmon to the conmon paths
| -rw-r--r-- | libpod/runtime.go | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libpod/runtime.go b/libpod/runtime.go index 52a2653b3..b208bc718 100644 --- a/libpod/runtime.go +++ b/libpod/runtime.go @@ -151,6 +151,7 @@ var ( "/usr/lib/cri-o-runc/sbin/runc", }, ConmonPath: []string{ + "/usr/libexec/podman/conmon", "/usr/libexec/crio/conmon", "/usr/local/libexec/crio/conmon", "/usr/bin/conmon", |