public/k3s
1
0
Fork 0
mirror of https://git.vectorsigma.ru/public/k3s.git synced 2026-07-29 04:59:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add more paths to crun runtime detection (#9086)

Browse Source 
* 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>
This commit is contained in:
Lex Rivera
2024-01-05 03:51:13 +03:00
committed by Brad Davidson
parent 0831de59e9
commit 080ec8148d
1 changed files with 4 additions and 2 deletions
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,