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

Merge branch 'main' of github.com:hpcng/warewulf into netdev_refactor

Browse Source
This commit is contained in:
Gregory Kurtzer
2021-12-28 15:18:08 -08:00
parent 938511e9cd 8101c497a4
commit 7d2fe7f22f
5 changed files with 61 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@@ -5,7 +5,7 @@ RELEASE ?= 1
SRC ?= main
VERSION_FULL ?= $(shell test -e .git && git describe --tags --long --first-parent)
VERSION_FULL ?= $(shell test -e .git && git describe --tags --long --first-parent --always)
ifeq ($(VERSION_FULL),)
VERSION_FULL := $(VERSION)
endif

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

@@ -16,6 +16,16 @@ import (
"github.com/hpcng/warewulf/internal/pkg/wwlog"
)
var (
kernelSearchPaths = []string{
// This is a printf format where the %s will be the kernel version
"/boot/vmlinuz-%s",
"/boot/vmlinuz-%s.gz",
"/lib/mmodules/%s/vmlinuz",
"/lib/mmodules/%s/vmlinuz.gz",
}
)
func ParentDir() string {
return path.Join(config.LocalStateDir, "provision/kernel")
}
@@ -100,12 +110,12 @@ func ListKernels() ([]string, error) {
}
func Build(kernelVersion string, kernelName string, root string) (string, error) {
kernelImage := path.Join(root, "/boot/vmlinuz-"+kernelVersion)
kernelDrivers := path.Join(root, "/lib/modules/"+kernelVersion)
kernelDriversRelative := path.Join("/lib/modules/"+kernelVersion)
kernelDestination := KernelImage(kernelName)
driversDestination := KmodsImage(kernelName)
versionDestination := KernelVersion(kernelName)
var kernelSource string
// Create the destination paths just in case it doesn't exist
err := os.MkdirAll(path.Dir(kernelDestination), 0755)
@@ -123,21 +133,29 @@ func Build(kernelVersion string, kernelName string, root string) (string, error)
return "", fmt.Errorf("failed to create version dest: %s", err)
}
if !util.IsFile(kernelImage) {
if !util.IsFile(kernelImage + ".gz") {
return "", errors.New("Could not locate kernel image")
} else {
kernelImage = kernelImage + ".gz"
for _, path := range kernelSearchPaths {
testPath := fmt.Sprintf(path, kernelVersion)
wwlog.Printf(wwlog.VERBOSE, "Looking for kernel at: %s\n", testPath)
if util.IsFile(testPath) {
kernelSource = testPath
break
}
}
if kernelSource == "" {
wwlog.Printf(wwlog.ERROR, "Could not locate kernel image\n")
return "", errors.New("could not locate kernel image")
} else {
wwlog.Printf(wwlog.INFO, "Found kernel at: %s\n", kernelSource)
}
if !util.IsDir(kernelDrivers) {
return "", errors.New("Could not locate kernel drivers")
}
wwlog.Printf(wwlog.VERBOSE, "Setting up Kernel\n")
if _, err := os.Stat(kernelImage); err == nil {
kernel, err := os.Open(kernelImage)
if _, err := os.Stat(kernelSource); err == nil {
kernel, err := os.Open(kernelSource)
if err != nil {
return "", errors.Wrap(err, "could not open kernel")
}
@@ -160,7 +178,7 @@ func Build(kernelVersion string, kernelName string, root string) (string, error)
} else {
err := util.CopyFile(kernelImage, kernelDestination)
err := util.CopyFile(kernelSource, kernelDestination)
if err != nil {
return "", errors.Wrap(err, "could not copy kernel")
}

4
internal/pkg/node/constructors.go
View File

@@ -2,7 +2,6 @@ package node
import (
"errors"
"fmt"
"io/ioutil"
"sort"
"strings"
@@ -16,10 +15,9 @@ var ConfigFile = "/etc/warewulf/nodes.conf"
func New() (nodeYaml, error) {
var ret nodeYaml
wwlog.Printf(wwlog.DEBUG, "Opening node configuration file: %s\n", ConfigFile)
wwlog.Printf(wwlog.VERBOSE, "Opening node configuration file: %s\n", ConfigFile)
data, err := ioutil.ReadFile(ConfigFile)
if err != nil {
fmt.Printf("error reading node configuration file\n")
return ret, err
}

5
internal/pkg/warewulfd/util.go
View File

@@ -36,10 +36,11 @@ func daemonLogf(message string, a ...interface{}) {
}
log.SetOutput(logwriter)
loginit = true
log.SetFlags(0)
log.SetPrefix("")
}
log.SetFlags(0)
log.SetPrefix("")
log.Printf(message, a...)
} else {

65
internal/pkg/wwlog/wwlog.go
View File

@@ -1,8 +1,8 @@
package wwlog
import (
"log"
"strings"
"fmt"
"os"
)
const (
@@ -16,55 +16,48 @@ const (
var (
logLevel = INFO
Indent string
)
func SetLevel(level int) {
logLevel = level
if level == DEBUG {
log.SetFlags(log.LstdFlags | log.Lmicroseconds | log.Lmsgprefix)
} else {
log.SetFlags(0)
}
Printf(DEBUG, "Set log level to: %d\n", logLevel)
}
func SetIndent(i int) {
Indent = strings.Repeat(" ", i)
func prefixGen(level int) string {
switch level {
case DEBUG:
return "[DEBUG] : "
case VERBOSE:
return "[VERBOSE] : "
case INFO:
return "[INFO] : "
case WARN:
return "[WARNING] : "
case ERROR:
return "[ERROR] : "
case CRITICAL:
return "[CRITICAL]: "
}
return "[UNDEF] : "
}
func prefixLevel(level int) {
if level == DEBUG {
log.SetPrefix("[DEBUG] " + Indent)
} else if level == VERBOSE {
log.SetPrefix("[VERBOSE] " + Indent)
} else if level == INFO {
log.SetPrefix("[INFO] " + Indent)
} else if level == WARN {
log.SetPrefix("[WARN] " + Indent)
} else if level == ERROR {
log.SetPrefix("[ERROR] " + Indent)
} else if level == CRITICAL {
log.SetPrefix("[CRITICAL] " + Indent)
func printlog(level int, message string) {
if level == INFO && logLevel <= INFO {
fmt.Print(message)
} else if level <= logLevel {
if level < INFO {
fmt.Fprintf(os.Stderr, prefixGen(level)+message)
} else {
fmt.Printf(prefixGen(level) + message)
}
}
}
func Println(level int, message string) {
if level <= logLevel {
prefixLevel(level)
log.Println(message)
}
log.SetPrefix("[LOG] " + Indent)
printlog(level, message)
}
func Printf(level int, message string, a ...interface{}) {
if level <= logLevel {
prefixLevel(level)
log.Printf(message, a...)
}
log.SetPrefix("[LOG] " + Indent)
printlog(level, fmt.Sprintf(message, a...))
}