kelvin/warewulf
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

allow download of named overlay

Browse Source
This commit is contained in:
Christian Goll
2022-03-11 14:52:01 +01:00
parent 5568b082c4
commit d4e42b7b83
2 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
internal/pkg/warewulfd/parser.go
View File

@@ -14,6 +14,7 @@ type parserInfo struct {
remoteport int
assetkey string
uuid string
overlay string
}
func parseReq(req *http.Request) (parserInfo, error) {
@@ -35,7 +36,9 @@ func parseReq(req *http.Request) (parserInfo, error) {
if len(req.URL.Query()["uuid"]) > 0 {
ret.uuid = req.URL.Query()["uuid"][0]
}
if len(req.URL.Query()["overlay"]) > 0 {
ret.overlay = req.URL.Query()["overlay"][0]
}
if ret.hwaddr == "" {
return ret, errors.New("no hwaddr encoded in GET")
}

12
internal/pkg/warewulfd/runtime.go
View File

@@ -45,8 +45,16 @@ func RuntimeOverlaySend(w http.ResponseWriter, req *http.Request) {
return
}
}
if len(node.RuntimeOverlay.GetSlice()) != 0 {
if rinfo.overlay != "" {
fileName := overlay.OverlayImage(node.Id.Get(), []string{rinfo.overlay})
if conf.Warewulf.AutobuildOverlays {
_ = overlay.BuildOverlay(node, []string{rinfo.overlay})
}
err := sendFile(w, fileName, node.Id.Get())
if err != nil {
daemonLogf("ERROR: %s\n", err)
}
} else if len(node.RuntimeOverlay.GetSlice()) != 0 {
fileName := overlay.OverlayImage(node.Id.Get(), node.RuntimeOverlay.GetSlice())
updateStatus(node.Id.Get(), "RUNTIME_OVERLAY", node.RuntimeOverlay.Get(), strings.Split(req.RemoteAddr, ":")[0])