From 2a59653bf3d5230a8be1a20ed9fcf53a185afba3 Mon Sep 17 00:00:00 2001 From: Valentin Rothberg Date: Wed, 28 Feb 2018 11:56:55 +0100 Subject: CNIPluginDir: check "/usr/lib/cni" 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 Closes: #416 Approved by: mheon --- libpod/runtime.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libpod/runtime.go b/libpod/runtime.go index 54dc9b8a7..552a4efc8 100644 --- a/libpod/runtime.go +++ b/libpod/runtime.go @@ -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"}, } ) -- cgit v1.2.3-54-g00ecf