Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

pkg/defaults: Look at Debian's path for CNI plugins #315

Merged
merged 1 commit into from
Aug 17, 2021

Conversation

vbatts
Copy link
Contributor

@vbatts vbatts commented Aug 17, 2021

Signed-off-by: Vincent Batts vbatts@hashbangbash.com

Signed-off-by: Vincent Batts <vbatts@hashbangbash.com>
@fuweid fuweid merged commit 85e2c46 into containerd:master Aug 17, 2021
@AkihiroSuda AkihiroSuda added this to the v0.12.0 milestone Aug 17, 2021
@@ -43,6 +43,7 @@ func CNIPath() string {
candidates := []string{
"/usr/local/libexec/cni",
"/usr/libexec/cni", // Fedora
"/usr/lib/cni", // debian (containernetworking-plugins)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we have to add /usr/local/lib/cni, and ~/lib/cni too?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Opened #321

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants