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

Cleanups and minor fixups

Browse Source
This commit is contained in:
Gregory Kurtzer
2020-12-13 22:45:08 -08:00
parent 487f45f7a9
commit 62a1abaab3
16 changed files with 73 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -69,7 +69,7 @@ func ListKernels() ([]string, error) {
return ret, nil
}
func Build(kernelVersion string) error {
func Build(kernelVersion string) (string, error) {
kernelImage := "/boot/vmlinuz-" + kernelVersion
kernelDrivers := "/lib/modules/" + kernelVersion
@@ -81,20 +81,19 @@ func Build(kernelVersion string) error {
os.MkdirAll(path.Dir(driversDestination), 0755)
if util.IsFile(kernelImage) == false {
return errors.New("Could not locate kernel image: " + kernelImage)
return "", errors.New("Could not locate kernel image")
}
if util.IsDir(kernelDrivers) == false {
return errors.New("Could not locate kernel drivers: " + kernelDrivers)
return "", errors.New("Could not locate kernel drivers")
}
wwlog.Printf(wwlog.VERBOSE, "Setting up Kernel\n")
if _, err := os.Stat(kernelImage); err == nil {
err := util.CopyFile(kernelImage, kernelDestination)
if err != nil {
return err
return "", err
}
wwlog.Printf(wwlog.INFO, "%-45s: Done\n", "vmlinuz-"+kernelVersion)
}
wwlog.Printf(wwlog.VERBOSE, "Building Kernel driver image\n")
@@ -102,10 +101,9 @@ func Build(kernelVersion string) error {
cmd := fmt.Sprintf("cd /; find .%s | cpio --quiet -o -H newc -F \"%s\"", kernelDrivers, driversDestination)
err := exec.Command("/bin/sh", "-c", cmd).Run()
if err != nil {
return err
return "", err
}
wwlog.Printf(wwlog.INFO, "%-45s: Done\n", "kmods-"+kernelVersion+".img")
}
return nil
return "Done", nil
}