use wwctl to re-build provision overlays, update to pass overlaynames

internal/pkg/warewulfd/provision.go

@@ -158,9 +158,25 @@ func ProvisionSend(w http.ResponseWriter, req *http.Request) {
 			for _, overlayname := range stage_overlays {
 				oneoverlaynewer = oneoverlaynewer || util.PathIsNewer(stage_file, overlay.OverlaySourceDir(overlayname))
 			}
+
 			if !util.IsFile(stage_file) || util.PathIsNewer(stage_file, nodepkg.ConfigFile) || oneoverlaynewer {
 				wwlog.Serv("BUILD %15s, overlays %v", node.Id.Get(), stage_overlays)
-				_ = overlay.BuildOverlay(node, stage_overlays)
+
+				args := []string{}
+
+				for _, overlayname := range stage_overlays {
+					args = append(args, "-O", overlayname)
+				}
+
+				args = append(args, node.Id.Get())
+
+				out, err := util.RunWWCTL("overlay", "build", args...)
+
+				if err != nil {
+					w.WriteHeader(http.StatusInternalServerError)
+					wwlog.ErrorExc(err, out)
+					return
+				}
 			}
 		}
 	}
@@ -219,7 +235,7 @@ func ProvisionSend(w http.ResponseWriter, req *http.Request) {
 				w.WriteHeader(http.StatusNotFound)
 			}
 
-			err = sendFile(w, stage_file, node.Id.Get())
+			err = sendFile(w, req, stage_file, node.Id.Get())
 			if err != nil {
 				wwlog.ErrorExc(err, "")
 				return

internal/pkg/warewulfd/util.go

@@ -1,16 +1,18 @@
 package warewulfd
 
 import (
-	"io"
 	"net/http"
 	"os"
-	"strconv"
 
 	"github.com/hpcng/warewulf/internal/pkg/wwlog"
-	"github.com/pkg/errors"
 )
 
-func sendFile(w http.ResponseWriter, filename string, sendto string) error {
+func sendFile(
+	w http.ResponseWriter,
+	req *http.Request,
+	filename string,
+	sendto string) error {
+
 	fd, err := os.Open(filename)
 	if err != nil {
 		w.WriteHeader(http.StatusInternalServerError)
@@ -18,34 +20,20 @@ func sendFile(w http.ResponseWriter, filename string, sendto string) error {
 	}
 	defer fd.Close()
 
-	FileHeader := make([]byte, 512)
-	_, err = fd.Read(FileHeader)
+	stat, err := fd.Stat()
 	if err != nil {
 		w.WriteHeader(http.StatusInternalServerError)
-		return errors.Wrap(err, "failed to read header")
+		return err
 	}
 
-	FileContentType := http.DetectContentType(FileHeader)
-	FileStat, _ := fd.Stat()
-	FileSize := strconv.FormatInt(FileStat.Size(), 10)
-
-	_, err = fd.Seek(0, 0)
-	if err != nil {
-		w.WriteHeader(http.StatusInternalServerError)
-		return errors.Wrap(err, "failed to seek")
-	}
-
-	w.Header().Set("Content-Disposition", "attachment; filename=kernel")
-	w.Header().Set("Content-Type", FileContentType)
-	w.Header().Set("Content-Length", FileSize)
-
-	_, err = io.Copy(w, fd)
-	if err != nil {
-		w.WriteHeader(http.StatusInternalServerError)
-		return errors.Wrap(err, "failed to copy")
-	}
+	http.ServeContent(
+		w,
+		req,
+		filename,
+		stat.ModTime(),
+		fd )
 
 	wwlog.Send("%15s: %s", sendto, filename)
 
-	return err
+	return nil
 }