Restored deleted kernel components for overrides

internal/pkg/warewulfd/ipxe.go

@@ -140,6 +140,7 @@ func IpxeSend(w http.ResponseWriter, req *http.Request) {
 	replace.Hwaddr = rinfo.hwaddr
 	replace.ContainerName = node.ContainerName.Get()
 	replace.KernelArgs = node.KernelArgs.Get()
+	replace.KernelVersion = node.KernelVersion.Get()
 
 	err = tmpl.Execute(w, replace)
 	if err != nil {

internal/pkg/warewulfd/kmods.go

@@ -0,0 +1,45 @@
+package warewulfd
+
+import (
+	"net/http"
+	"strings"
+
+	"github.com/hpcng/warewulf/internal/pkg/kernel"
+)
+
+func KmodsSend(w http.ResponseWriter, req *http.Request) {
+	rinfo, err := parseReq(req)
+	if err != nil {
+		w.WriteHeader(404)
+		daemonLogf("ERROR: %s\n", err)
+		return
+	}
+	node, err := GetNode(rinfo.hwaddr)
+	if err != nil {
+		w.WriteHeader(403)
+		daemonLogf("ERROR(%s): %s\n", rinfo.hwaddr, err)
+		return
+	}
+
+	if node.AssetKey.Defined() && node.AssetKey.Get() != rinfo.assetkey {
+		w.WriteHeader(404)
+		daemonLogf("ERROR: Incorrect asset key for node: %s\n", node.Id.Get())
+		updateStatus(node.Id.Get(), "KMODS_OVERLAY", "BAD_ASSET", rinfo.ipaddr)
+		return
+	}
+
+	if node.KernelVersion.Defined() {
+		fileName := kernel.KmodsImage(node.KernelVersion.Get())
+
+		updateStatus(node.Id.Get(), "KMODS_OVERLAY", node.KernelVersion.Get()+".img", strings.Split(req.RemoteAddr, ":")[0])
+
+		err := sendFile(w, fileName, node.Id.Get())
+		if err != nil {
+			daemonLogf("ERROR: %s\n", err)
+		}
+
+	} else {
+		w.WriteHeader(503)
+		daemonLogf("WARNING: No 'kernel version' set for node %s\n", node.Id.Get())
+	}
+}

internal/pkg/warewulfd/warewulfd.go

@@ -48,6 +48,7 @@ func RunServer() error {
 
 	http.HandleFunc("/ipxe/", IpxeSend)
 	http.HandleFunc("/kernel/", KernelSend)
+	http.HandleFunc("/kmods/", KmodsSend)
 	http.HandleFunc("/container/", ContainerSend)
 	http.HandleFunc("/overlay-system/", SystemOverlaySend)
 	http.HandleFunc("/overlay-runtime/", RuntimeOverlaySend)