0b3e862bea
I noticed that some wwlog calls included a trailing newline, but others did not. I tested both in isolation and discovered that the behavior was consistent regardless of whether a trailing newline was included. I further confirmed in code that wwlog appends a trailing newline automatically if it is not present; so a trailing newline is unnecessary in individual calls. This commit removes trailing newlines from all calls to make them consistent. It also replaces two calls to wwlog.Printf. (see #534) Signed-off-by: Jonathon Anderson <janderson@ciq.co>
70 lines
1.3 KiB
Go
70 lines
1.3 KiB
Go
package container
|
|
|
|
import (
|
|
"path"
|
|
"path/filepath"
|
|
"sort"
|
|
|
|
"github.com/hpcng/warewulf/internal/pkg/util"
|
|
"github.com/hpcng/warewulf/internal/pkg/wwlog"
|
|
)
|
|
|
|
var (
|
|
kernelNames = []string{
|
|
`vmlinux`,
|
|
`vmlinuz`,
|
|
`vmlinux-*`,
|
|
`vmlinuz-*`,
|
|
`vmlinuz.gz` }
|
|
|
|
kernelDirs = []string{
|
|
`/lib/modules/*/`,
|
|
`/boot/` }
|
|
)
|
|
|
|
func KernelFind(container string) string {
|
|
wwlog.Debug("Finding kernel")
|
|
container_path := RootFsDir(container)
|
|
if container_path == "" {
|
|
return ""
|
|
}
|
|
|
|
for _, kdir := range kernelDirs {
|
|
wwlog.Debug("Checking kernel directory: %s", kdir)
|
|
for _, kname := range kernelNames {
|
|
wwlog.Debug("Checking for kernel name: %s", kname)
|
|
kernelPaths, err := filepath.Glob(path.Join(container_path, kdir, kname))
|
|
if err != nil {
|
|
return ""
|
|
}
|
|
|
|
if len(kernelPaths) == 0 {
|
|
continue
|
|
}
|
|
|
|
sort.Slice(kernelPaths, func(i, j int) bool {
|
|
return kernelPaths[i] > kernelPaths[j]
|
|
})
|
|
|
|
for _, kernelPath := range kernelPaths {
|
|
wwlog.Debug("Checking for kernel path: %s", kernelPath)
|
|
if util.IsFile(kernelPath) {
|
|
return kernelPath
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
return ""
|
|
}
|
|
|
|
func KernelVersion(container string) string {
|
|
wwlog.Debug("Finding kernel version inside container: %s", container)
|
|
kernel := KernelFind(container)
|
|
if kernel == "" {
|
|
return ""
|
|
}
|
|
|
|
return path.Base(path.Dir(kernel))
|
|
}
|