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

Revert "allow compressed kernels with gz suffix"

Browse Source
This commit is contained in:
Gregory M. Kurtzer
2021-09-22 23:11:06 -07:00
committed by GitHub
parent e82210c617
commit 77bee733b3
1 changed files with 13 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6,12 +6,12 @@ import (
"os"
"os/exec"
"path"
"strings"
"github.com/pkg/errors"
"github.com/hpcng/warewulf/internal/pkg/config"
"github.com/hpcng/warewulf/internal/pkg/util"
"github.com/hpcng/warewulf/internal/pkg/wwlog"
"github.com/pkg/errors"
)
func ParentDir() string {
@@ -72,34 +72,28 @@ func ListKernels() ([]string, error) {
}
func Build(kernelVersion string, root string) (string, error) {
kernelImage := path.Join(root, "/boot/vmlinuz-"+kernelVersion)
kernelDrivers := path.Join(root, "/lib/modules/"+kernelVersion)
kernelDestination := KernelImage(kernelVersion)
driversDestination := KmodsImage(kernelVersion)
// Create the destination paths just in case it doesn't exist
if err := os.MkdirAll(path.Dir(kernelDestination), 0755) ; err != nil {
return "", errors.Wrap(err, "failed to create kernal dest")
}
if err := os.MkdirAll(path.Dir(driversDestination), 0755) ; err != nil {
return "", errors.Wrap(err, "failed to create driver dest")
}
err := os.MkdirAll(path.Dir(kernelDestination), 0755)
if err != nil {
return "", fmt.Errorf("failed to create kernal dest: %s", err)
}
err = os.MkdirAll(path.Dir(driversDestination), 0755)
if err != nil {
return "", fmt.Errorf("failed to create driver dest: %s", err)
}
if !util.IsFile(kernelImage) {
// allow uncompressed kernels (can be handy for aarch64)
kernelImage = path.Join(root, "/boot/vmlinux-"+kernelVersion)
if !util.IsFile(kernelImage) {
return "", errors.New("Could not locate kernel image")
}
return "", errors.New("Could not locate kernel image")
}
if !util.IsDir(kernelDrivers) {
// strip a gz suffix
kernelDrivers = strings.TrimRight(kernelDrivers, ".gz")
if !util.IsDir(kernelDrivers) {
return "", errors.New("Could not locate kernel drivers")
}
return "", errors.New("Could not locate kernel drivers")
}
wwlog.Printf(wwlog.VERBOSE, "Setting up Kernel\n")