From 9f7643c364dece892a7f89484142e69c8e8185f8 Mon Sep 17 00:00:00 2001 From: baude Date: Mon, 26 Feb 2018 13:38:00 -0600 Subject: 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 Closes: #406 Approved by: baude --- libpod/runtime.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libpod') 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) } -- cgit v1.2.3-54-g00ecf