diff options
| author | Stefan Agner <stefan.agner@toradex.com> | 2019-09-20 09:18:05 +0200 |
|---|---|---|
| committer | Bruce Ashfield <bruce.ashfield@gmail.com> | 2019-10-02 14:13:35 -0400 |
| commit | aa509c629e1f623ff63ae2f685f5605b309a0e3d (patch) | |
| tree | c6b024b78f0f4ecf97b8ec60e9be668b949dcc4e /recipes-containers | |
| parent | 05db2367ccc54fb04fd1abe20a39c6114a482817 (diff) | |
| download | meta-virtualization-aa509c629e1f623ff63ae2f685f5605b309a0e3d.tar.gz | |
cni: move cni tools to /usr/libexec/cni
Use a standard location to store the cni tools and plugins. This
is more in line how other distributions package cni. Keep a symlink
to /opt/cni/bin for backward compatibility.
Signed-off-by: Stefan Agner <stefan.agner@toradex.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Diffstat (limited to 'recipes-containers')
| -rw-r--r-- | recipes-containers/cri-o/files/crio.conf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/recipes-containers/cri-o/files/crio.conf b/recipes-containers/cri-o/files/crio.conf index 51d7f404..9135df08 100644 --- a/recipes-containers/cri-o/files/crio.conf +++ b/recipes-containers/cri-o/files/crio.conf | |||
| @@ -144,4 +144,4 @@ registries = [ | |||
| 144 | network_dir = "/etc/cni/net.d/" | 144 | network_dir = "/etc/cni/net.d/" |
| 145 | 145 | ||
| 146 | # plugin_dir is is where CNI plugin binaries are stored. | 146 | # plugin_dir is is where CNI plugin binaries are stored. |
| 147 | plugin_dir = "/opt/cni/bin/" | 147 | plugin_dir = "/opt/cni/bin" |