Merge pull request #1707 from afbjorklund/local_path

Add support for /usr/local installation
This commit is contained in:
OpenShift Merge Robot
2018-10-23 14:29:43 -07:00
committed by GitHub

View File

@ -8,6 +8,8 @@ image_default_transport = "docker://"
runtime_path = [
"/usr/bin/runc",
"/usr/sbin/runc",
"/usr/local/bin/runc",
"/usr/local/sbin/runc",
"/sbin/runc",
"/bin/runc",
"/usr/lib/cri-o-runc/sbin/runc"
@ -17,6 +19,7 @@ runtime_path = [
conmon_path = [
"/usr/libexec/podman/conmon",
"/usr/libexec/crio/conmon",
"/usr/local/lib/podman/conmon",
"/usr/local/libexec/crio/conmon",
"/usr/bin/conmon",
"/usr/sbin/conmon",
@ -55,6 +58,7 @@ cni_config_dir = "/etc/cni/net.d/"
cni_plugin_dir = [
"/usr/libexec/cni",
"/usr/lib/cni",
"/usr/local/lib/cni",
"/opt/cni/bin"
]