diff options
| author | Anders F Björklund <anders.f.bjorklund@gmail.com> | 2018-10-29 19:10:21 +0100 |
|---|---|---|
| committer | Anders F Björklund <anders.f.bjorklund@gmail.com> | 2018-10-29 19:11:47 +0100 |
| commit | 1c4880d3ef2888148bae76f19b4f4f8a215a91aa (patch) | |
| tree | b0a6551113c90bd9374c4e338e89641353fedcf3 /libpod | |
| parent | aef9d56ae20e34447a69e19613629b8281a78502 (diff) | |
| download | podman-1c4880d3ef2888148bae76f19b4f4f8a215a91aa.tar.gz podman-1c4880d3ef2888148bae76f19b4f4f8a215a91aa.tar.bz2 podman-1c4880d3ef2888148bae76f19b4f4f8a215a91aa.zip | |
Sync default config with libpod.conf
Only changed libpod.conf file, which might not even be in use.
Signed-off-by: Anders F Björklund <anders.f.bjorklund@gmail.com>
Diffstat (limited to 'libpod')
| -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, |