diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2018-10-29 15:17:04 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-29 15:17:04 -0700 |
| commit | 7052c8534e7840d928ad0ce664b905262a160106 (patch) | |
| tree | bcaf498cd7e362b12ed2f0b6e0d133b5f8f3d95c | |
| parent | 60ba26ab2139e6ab5d50138bd36494ef323e19a1 (diff) | |
| parent | 1c4880d3ef2888148bae76f19b4f4f8a215a91aa (diff) | |
| download | podman-7052c8534e7840d928ad0ce664b905262a160106.tar.gz podman-7052c8534e7840d928ad0ce664b905262a160106.tar.bz2 podman-7052c8534e7840d928ad0ce664b905262a160106.zip | |
Merge pull request #1723 from afbjorklund/local_config
Sync default config with libpod.conf
| -rw-r--r-- | libpod/runtime.go | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libpod/runtime.go b/libpod/runtime.go index 1b26f851f..318cd0369 100644 --- a/libpod/runtime.go +++ b/libpod/runtime.go @@ -184,6 +184,8 @@ var ( RuntimePath: []string{ "/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", @@ -191,6 +193,7 @@ var ( ConmonPath: []string{ "/usr/libexec/podman/conmon", "/usr/libexec/crio/conmon", + "/usr/local/lib/podman/conmon", "/usr/local/libexec/crio/conmon", "/usr/bin/conmon", "/usr/sbin/conmon", @@ -206,7 +209,7 @@ var ( MaxLogSize: -1, NoPivotRoot: false, CNIConfigDir: "/etc/cni/net.d/", - CNIPluginDir: []string{"/usr/libexec/cni", "/usr/lib/cni", "/opt/cni/bin"}, + CNIPluginDir: []string{"/usr/libexec/cni", "/usr/lib/cni", "/usr/local/lib/cni", "/opt/cni/bin"}, InfraCommand: DefaultInfraCommand, InfraImage: DefaultInfraImage, EnablePortReservation: true, |