kelvin/warewulf
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fixed ShimFind for aarch64

Browse Source 
Signed-off-by: Christian Goll <cgoll@suse.com>
This commit is contained in:
Christian Goll
2024-03-18 16:18:25 +01:00
committed by Jonathon Anderson
parent 16f5b7408e
commit b192e3b5d5
5 changed files with 40 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
internal/pkg/kernel/kernel.go
View File

@@ -17,8 +17,9 @@ import (
)
var (
kernelSearchPaths = []string{
KernelSearchPaths = []string{
// This is a printf format where the %s will be the kernel version
"/boot/Image-%s", // this is the aarch64 for SUSE, vmlinux which is also present won't boot
"/boot/vmlinuz-linux%.s",
"/boot/vmlinuz-%s",
"/boot/vmlinuz-%s.gz",
@@ -143,7 +144,7 @@ func Build(kernelVersion, kernelName, root string) error {
return fmt.Errorf("failed to create version dest: %s", err)
}
for _, searchPath := range kernelSearchPaths {
for _, searchPath := range KernelSearchPaths {
testPath := fmt.Sprintf(path.Join(root, searchPath), kernelVersion)
wwlog.Verbose("Looking for kernel at: %s", testPath)
if util.IsFile(testPath) {
@@ -236,7 +237,7 @@ func DeleteKernel(name string) error {
}
func FindKernelVersion(root string) (string, error) {
for _, searchPath := range kernelSearchPaths {
for _, searchPath := range KernelSearchPaths {
testPattern := fmt.Sprintf(path.Join(root, searchPath), `*`)
wwlog.Verbose("Looking for kernel version with pattern at: %s", testPattern)
potentialKernel, _ := filepath.Glob(testPattern)