From fd49254ac592d325056aa58a564933a008539607 Mon Sep 17 00:00:00 2001 From: Jonathon Anderson Date: Wed, 12 Feb 2025 11:46:49 -0700 Subject: [PATCH] Display auto-detected kernel version during iPXE and GRUB Signed-off-by: Jonathon Anderson --- CHANGELOG.md | 1 + internal/pkg/warewulfd/provision.go | 10 ++++++++++ 2 files changed, 11 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 26319b01..b5d4f7b7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -37,6 +37,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - Defined a menu for iPXE. #1156 - Added logging to wwinit scripts. #1156 - Renamed /warewulf/wwinit to /warewulf/prescripts. #1156 +- Display auto-detected kernel version during iPXE and GRUB. #1742 ### Fixed diff --git a/internal/pkg/warewulfd/provision.go b/internal/pkg/warewulfd/provision.go index ab1d16da..07e261dd 100644 --- a/internal/pkg/warewulfd/provision.go +++ b/internal/pkg/warewulfd/provision.go @@ -104,6 +104,11 @@ func ProvisionSend(w http.ResponseWriter, req *http.Request) { kernelArgs = strings.Join(remoteNode.Kernel.Args, " ") kernelVersion = remoteNode.Kernel.Version } + if kernelVersion == "" { + if kernel_ := kernel.FromNode(&remoteNode); kernel_ != nil { + kernelVersion = kernel_.Version() + } + } tmpl_data = &templateVars{ Id: remoteNode.Id(), Cluster: remoteNode.ClusterName, @@ -186,6 +191,11 @@ func ProvisionSend(w http.ResponseWriter, req *http.Request) { kernelArgs = strings.Join(remoteNode.Kernel.Args, " ") kernelVersion = remoteNode.Kernel.Version } + if kernelVersion == "" { + if kernel_ := kernel.FromNode(&remoteNode); kernel_ != nil { + kernelVersion = kernel_.Version() + } + } tmpl_data = &templateVars{ Id: remoteNode.Id(), Cluster: remoteNode.ClusterName,