diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2018-10-23 14:29:43 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-23 14:29:43 -0700 |
| commit | 28d8d72a82bc195f47ef5ec14c33ec61231d9b38 (patch) | |
| tree | aaf10b309fdbf2205092b87a773e325ba11db8a0 | |
| parent | 10bab99ea01006c4ca0048e6177d753f0732add7 (diff) | |
| parent | 21458369a1d67d0ee6c2a00656e641d96e3b9d36 (diff) | |
| download | podman-28d8d72a82bc195f47ef5ec14c33ec61231d9b38.tar.gz podman-28d8d72a82bc195f47ef5ec14c33ec61231d9b38.tar.bz2 podman-28d8d72a82bc195f47ef5ec14c33ec61231d9b38.zip | |
Merge pull request #1707 from afbjorklund/local_path
Add support for /usr/local installation
| -rw-r--r-- | libpod.conf | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libpod.conf b/libpod.conf index 2976cec02..d7469af68 100644 --- a/libpod.conf +++ b/libpod.conf @@ -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" ] |