Skip to content

K
k3s
Commit 080ec814 authored by Lex Rivera's avatar Lex Rivera Committed by Brad Davidson
Browse files
Options

Add more paths to crun runtime detection (#9086)

* add usr/local paths for crun detection Signed-off-by: 's avatarLex Rivera <me@lex.io> (cherry picked from commit 5fe074b5) Signed-off-by: 's avatarBrad Davidson <brad.davidson@rancher.com>
parent 0831de59
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 2 deletions
pkg/agent/containerd/runtimes.go
View file @ 080ec814
...@@ -65,8 +65,10 @@ func findContainerRuntimes(root fs.FS) runtimeConfigs { ...@@ -65,8 +65,10 @@ func findContainerRuntimes(root fs.FS) runtimeConfigs {
func findCRunContainerRuntime(root fs.FS, foundRuntimes runtimeConfigs) { func findCRunContainerRuntime(root fs.FS, foundRuntimes runtimeConfigs) {
// Check these locations in order. // Check these locations in order.
locationsToCheck := []string{ locationsToCheck := []string{
"usr/sbin", // Path when installing via package manager "usr/sbin", // Path when installing via package manager
"usr/bin", // Path when installing via package manager "usr/bin", // Path when installing via package manager
"usr/local/bin", // Path when installing manually
"usr/local/sbin", // Path when installing manually
} }
// Fill in the binary location with just the name of the binary, // Fill in the binary location with just the name of the binary,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment