Merge branch 'main' of github.com:gmkurtzer/warewulf into wwlog_refactor

internal/pkg/warewulfd/daemon.go

@@ -9,6 +9,7 @@ import (
 	"syscall"
 
 	"github.com/hpcng/warewulf/internal/pkg/util"
+	"github.com/hpcng/warewulf/internal/pkg/version"
 	"github.com/pkg/errors"
 )
 
@@ -53,7 +54,7 @@ func DaemonStart() error {
 
 		fmt.Fprintf(p, "%d", pid)
 
-		fmt.Printf("Started Warewulf server at PID: %d\n", pid)
+		fmt.Printf("Started Warewulf (%s) server at PID: %d\n", version.GetVersion(), pid)
 
 	}
 

internal/pkg/warewulfd/ipxe.go

@@ -18,6 +18,8 @@ type iPxeTemplate struct {
 	WaitTime      string
 	Hostname      string
 	Fqdn          string
+	Id            string
+	Cluster       string
 	ContainerName string
 	Hwaddr        string
 	Ipaddr        string
@@ -129,6 +131,8 @@ func IpxeSend(w http.ResponseWriter, req *http.Request) {
 
 		var replace iPxeTemplate
 
+		replace.Id = nodeobj.Id.Get()
+		replace.Cluster = nodeobj.ClusterName.Get()
 		replace.Fqdn = nodeobj.Id.Get()
 		replace.Ipaddr = conf.Ipaddr
 		replace.Port = strconv.Itoa(conf.Warewulf.Port)