summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbaude <bbaude@redhat.com>2018-02-26 13:38:00 -0600
committerAtomic Bot <atomic-devel@projectatomic.io>2018-02-26 20:37:30 +0000
commit9f7643c364dece892a7f89484142e69c8e8185f8 (patch)
treed34a7579b7d25d9145bf31528dff86c7d7c91bc1
parent6831db7f10cc00e3b8de8ab1e126ad228d2a9329 (diff)
downloadpodman-9f7643c364dece892a7f89484142e69c8e8185f8.tar.gz
podman-9f7643c364dece892a7f89484142e69c8e8185f8.tar.bz2
podman-9f7643c364dece892a7f89484142e69c8e8185f8.zip
Add ubuntu paths
The packages in Lokesh's ppa that is currently used for podman puts the conmon and runc binaries in /usr/lib/crio/bin/conmon and /usr/lib/cri-o-runc/sbin/runc respectively. Signed-off-by: baude <bbaude@redhat.com> Closes: #406 Approved by: baude
-rw-r--r--libpod/runtime.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/libpod/runtime.go b/libpod/runtime.go
index 894e4b4d0..54dc9b8a7 100644
--- a/libpod/runtime.go
+++ b/libpod/runtime.go
@@ -94,12 +94,12 @@ var (
)
func findConmonPath() string {
- paths := []string{"/usr/libexec/crio/conmon", "/usr/local/libexec/crio/conmon", "/usr/bin/conmon", "/usr/sbin/conmon"}
+ paths := []string{"/usr/libexec/crio/conmon", "/usr/local/libexec/crio/conmon", "/usr/bin/conmon", "/usr/sbin/conmon", "/usr/lib/crio/bin/conmon"}
return pathHelper(paths)
}
func findRuncPath() string {
- paths := []string{"/usr/bin/runc", "/usr/sbin/runc", "/sbin/runc", "/bin/runc"}
+ paths := []string{"/usr/bin/runc", "/usr/sbin/runc", "/sbin/runc", "/bin/runc", "/usr/lib/cri-o-runc/sbin/runc"}
return pathHelper(paths)
}