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)

Browse Source 
* add usr/local paths for crun detection

Signed-off-by: Lex Rivera <me@lex.io>
pull/6874/head
Lex Rivera 11 months ago committed by GitHub
parent c45524e662
commit 5fe074b540
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File

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

@ -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,

Write Preview
Loading…
Cancel
Save