From 558f5ef65bab2c8e3617ff0b17be8d31129f89c9 Mon Sep 17 00:00:00 2001 From: Christian Goll Date: Tue, 18 Jan 2022 15:34:29 +0100 Subject: [PATCH] fixed kernel import from container --- internal/pkg/kernel/kernel.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/internal/pkg/kernel/kernel.go b/internal/pkg/kernel/kernel.go index ced5f791..9b2edb05 100644 --- a/internal/pkg/kernel/kernel.go +++ b/internal/pkg/kernel/kernel.go @@ -111,7 +111,7 @@ func ListKernels() ([]string, error) { func Build(kernelVersion string, kernelName string, root string) (string, error) { kernelDrivers := path.Join(root, "/lib/modules/"+kernelVersion) - kernelDriversRelative := path.Join("/lib/modules/"+kernelVersion) + kernelDriversRelative := path.Join("/lib/modules/" + kernelVersion) kernelDestination := KernelImage(kernelName) driversDestination := KmodsImage(kernelName) versionDestination := KernelVersion(kernelName) @@ -133,8 +133,8 @@ func Build(kernelVersion string, kernelName string, root string) (string, error) return "", fmt.Errorf("failed to create version dest: %s", err) } - for _, path := range kernelSearchPaths { - testPath := fmt.Sprintf(path, kernelVersion) + for _, searchPath := range kernelSearchPaths { + testPath := fmt.Sprintf(path.Join(root, searchPath), kernelVersion) wwlog.Printf(wwlog.VERBOSE, "Looking for kernel at: %s\n", testPath) if util.IsFile(testPath) { kernelSource = testPath