summaryrefslogtreecommitdiff
path: root/libpod
diff options
context:
space:
mode:
authorValentin Rothberg <vrothberg@suse.com>2018-02-28 11:56:55 +0100
committerAtomic Bot <atomic-devel@projectatomic.io>2018-02-28 14:48:26 +0000
commit2a59653bf3d5230a8be1a20ed9fcf53a185afba3 (patch)
tree335f115cbae9b273abee47b3c2784c3b7bca6edd /libpod
parentafbb2a7f234f911d0ea99e5ad0bcee2bf1f18475 (diff)
downloadpodman-2a59653bf3d5230a8be1a20ed9fcf53a185afba3.tar.gz
podman-2a59653bf3d5230a8be1a20ed9fcf53a185afba3.tar.bz2
podman-2a59653bf3d5230a8be1a20ed9fcf53a185afba3.zip
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 <vrothberg@suse.com> Closes: #416 Approved by: mheon
Diffstat (limited to 'libpod')
-rw-r--r--libpod/runtime.go2
1 files changed, 1 insertions, 1 deletions
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"},
}
)