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

Merge pull request #241 from mslacken/fix-kernel-imprt

Browse Source 
fixups for kernel import
This commit is contained in:
Gregory M. Kurtzer
2022-01-18 22:13:31 -08:00
committed by GitHub
parent 8ca65016fa b426482d82
commit 7fbbb92173
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
internal/app/wwctl/container/imprt/main.go
View File

@@ -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")

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

@@ -133,8 +133,8 @@ func Build(kernelVersion, kernelName, 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