opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-23 18:59:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1723 from afbjorklund/local_config

Browse Source 
Sync default config with libpod.conf
This commit is contained in:
OpenShift Merge Robot
2018-10-29 15:17:04 -07:00
committed by GitHub
parent 60ba26ab21 1c4880d3ef
commit 7052c8534e
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libpod/runtime.go
View File

@ -184,6 +184,8 @@ var (
RuntimePath: []string{ RuntimePath: []string{
"/usr/bin/runc", "/usr/bin/runc",
"/usr/sbin/runc", "/usr/sbin/runc",
"/usr/local/bin/runc",
"/usr/local/sbin/runc",
"/sbin/runc", "/sbin/runc",
"/bin/runc", "/bin/runc",
"/usr/lib/cri-o-runc/sbin/runc", "/usr/lib/cri-o-runc/sbin/runc",
@ -191,6 +193,7 @@ var (
ConmonPath: []string{ ConmonPath: []string{
"/usr/libexec/podman/conmon", "/usr/libexec/podman/conmon",
"/usr/libexec/crio/conmon", "/usr/libexec/crio/conmon",
"/usr/local/lib/podman/conmon",
"/usr/local/libexec/crio/conmon", "/usr/local/libexec/crio/conmon",
"/usr/bin/conmon", "/usr/bin/conmon",
"/usr/sbin/conmon", "/usr/sbin/conmon",
@ -206,7 +209,7 @@ var (
MaxLogSize: -1, MaxLogSize: -1,
NoPivotRoot: false, NoPivotRoot: false,
CNIConfigDir: "/etc/cni/net.d/", 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, InfraCommand: DefaultInfraCommand,
InfraImage: DefaultInfraImage, InfraImage: DefaultInfraImage,
EnablePortReservation: true, EnablePortReservation: true,