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

CNIPluginDir: check "/usr/lib/cni"

Browse Source 
Also consider "/usr/lib/cni" as a potential directory for CNI plugins.
On some distributions, e.g., on openSUSE, %{_libexecdir} evaluates to
"/usr/lib".

Signed-off-by: Valentin Rothberg <vrothberg@suse.com>

Closes: #416
Approved by: mheon
This commit is contained in:
Valentin Rothberg
2018-02-28 11:56:55 +01:00
committed by Atomic Bot
parent afbb2a7f23
commit 2a59653bf3
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libpod/runtime.go
View File

@ -89,7 +89,7 @@ var (
MaxLogSize: -1,
NoPivotRoot: false,
CNIConfigDir: "/etc/cni/net.d/",
CNIPluginDir: []string{"/usr/libexec/cni", "/opt/cni/bin"},
CNIPluginDir: []string{"/usr/libexec/cni", "/usr/lib/cni", "/opt/cni/bin"},
}
)