From 558f5ef65bab2c8e3617ff0b17be8d31129f89c9 Mon Sep 17 00:00:00 2001 From: Christian Goll Date: Tue, 18 Jan 2022 15:34:29 +0100 Subject: [PATCH 1/2] 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 From b426482d82667a06c48d9d950e8cc6ea9f38fa9d Mon Sep 17 00:00:00 2001 From: Christian Goll Date: Tue, 18 Jan 2022 15:41:31 +0100 Subject: [PATCH 2/2] need valid url or dir to import something --- internal/app/wwctl/container/imprt/main.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/internal/app/wwctl/container/imprt/main.go b/internal/app/wwctl/container/imprt/main.go index 97d36648..b91a5bd5 100644 --- a/internal/app/wwctl/container/imprt/main.go +++ b/internal/app/wwctl/container/imprt/main.go @@ -99,9 +99,7 @@ func CobraRunE(cmd *cobra.Command, args []string) error { wwlog.Printf(wwlog.ERROR, "VNFS Name exists, specify --force, --update, or choose a different name: %s\n", name) os.Exit(1) } - } - - if strings.HasPrefix(uri, "docker://") || strings.HasPrefix(uri, "docker-daemon://") { + } else if strings.HasPrefix(uri, "docker://") || strings.HasPrefix(uri, "docker-daemon://") { sCtx, err := getSystemContext() if err != nil { wwlog.Printf(wwlog.ERROR, "%s\n", err) @@ -120,6 +118,9 @@ func CobraRunE(cmd *cobra.Command, args []string) error { _ = container.DeleteSource(name) os.Exit(1) } + } else { + wwlog.Printf(wwlog.ERROR, "Invalid dir or uri: %s\n", uri) + os.Exit(1) } fmt.Printf("Updating the container's /etc/resolv.conf\n")