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

Merge pull request #432 from gmkurtzer/4.3.0rc6_fixes

Browse Source 
4.3.0rc6 fixes
This commit is contained in:
Gregory M. Kurtzer
2022-06-01 22:38:20 -07:00
committed by GitHub
parent 010b404ce9 2f6c1f728d
commit 055875f944
2 changed files with 32 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
etc/ipxe/default.ipxe
View File

@@ -19,40 +19,41 @@ echo Warewulf Controller: {{.Ipaddr}}
echo Downloading Kernel Image:
kernel --name kernel ${uri_base}&stage=kernel || goto reboot
## try extracting compressed images first
## NOTE: system overlay tends to be the smallest, so failure here is the cheapest
#echo Downloading Container Image:
#imgextract --name container ${uri_base}&stage=container&compress=gz || goto nocompress
#
#echo Downloading System Overlay:
#imgextract --name system ${uri_base}&stage=system&compress=gz || goto reboot
#
#echo Downloading Runtime Overlay:
#imgextract --name runtime ${uri_base}&stage=runtime&compress=gz || goto reboot
#
#{{if ne .KernelOverride "" -}}
#echo Downloading Kernel Modules:
#imgextract --name kmods ${uri_base}&stage=kmods&compress=gz || goto reboot
#{{- end}}
#
#goto imoktogo
#
#:nocompress
#
#echo Extraction failed, attempting un-compressed version of images
# try extracting compressed images first
# NOTE: system overlay tends to be the smallest, so failure here is the cheapest
echo Downloading Container Image:
initrd --name container ${uri_base}&stage=container || goto reboot
imgextract --name container ${uri_base}&stage=container&compress=gz || goto nocompress
echo Downloading System Overlay:
initrd --name system ${uri_base}&stage=system || goto reboot
imgextract --name system ${uri_base}&stage=system&compress=gz || goto reboot
echo Downloading Runtime Overlay:
initrd --name runtime ${uri_base}&stage=runtime || goto reboot
imgextract --name runtime ${uri_base}&stage=runtime&compress=gz || goto reboot
{{if ne .KernelOverride "" -}}
echo Downloading Kernel Modules:
initrd --name kmods ${uri_base}&stage=kmods || goto reboot
imgextract --name kmods ${uri_base}&stage=kmods&compress=gz || goto reboot
{{- end}}
goto imoktogo
:nocompress
echo
echo Image extract not supported in this iPXE, using standard initrd mode
echo Downloading Container Image:
initrd --name container ${uri_base}&stage=container&compress=gz || goto reboot
echo Downloading System Overlay:
initrd --name system ${uri_base}&stage=system&compress=gz || goto reboot
echo Downloading Runtime Overlay:
initrd --name runtime ${uri_base}&stage=runtime&compress=gz || goto reboot
{{if ne .KernelOverride "" -}}
echo Downloading Kernel Modules:
initrd --name kmods ${uri_base}&stage=kmods&compress=gz || goto reboot
{{- end}}

13
internal/pkg/warewulfd/util.go
View File

@@ -2,7 +2,6 @@ package warewulfd
import (
"io"
"bytes"
"net/http"
"os"
"strconv"
@@ -36,18 +35,16 @@ func sendFile(w http.ResponseWriter, filename string, sendto string) error {
return errors.Wrap(err, "failed to seek")
}
var buf bytes.Buffer
_, err = io.Copy(&buf, fd)
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")
}
w.Header().Set("Content-Disposition", "attachment; filename=kernel")
w.Header().Set("Content-Type", FileContentType)
w.Header().Set("Content-Length", FileSize)
_, err = buf.WriteTo(w)
wwlog.Send("%15s: %s", sendto, filename)
return err