github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Add more paths to crun runtime detection (#9086) 

* add usr/local paths for crun detection

Signed-off-by: Lex Rivera <me@lex.io>
(cherry picked from commit 5fe074b540)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
pull/9216/head
Lex Rivera 2024-01-05 03:51:13 +03:00 committed by Brad Davidson
parent fa798ba272
commit 3be858a878
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/agent/containerd/runtimes.go
View File

@ -65,8 +65,10 @@ func findContainerRuntimes(root fs.FS) runtimeConfigs {
func findCRunContainerRuntime(root fs.FS, foundRuntimes runtimeConfigs) {
// Check these locations in order.
locationsToCheck := []string{
"usr/sbin", // Path when installing via package manager
"usr/bin", // Path when installing via package manager
"usr/sbin", // 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,