lordwelch/gokrazy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

POC: zstd support

Browse Source 
see 7a71061374
This commit is contained in:
Michael Stapelberg 2020-06-26 11:57:04 +02:00
parent fc121e1383
commit 985d2475dc
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
update.go
View File

@ -11,6 +11,7 @@ import (
"net/http"
"os"
"regexp"
"strings"
"sync"
"syscall"
"time"
@ -19,6 +20,7 @@ import (
"github.com/gokrazy/internal/fat"
"github.com/gokrazy/internal/rootdev"
"github.com/klauspost/compress/zstd"
)
var rootRe = regexp.MustCompile(`root=[^ ]+`)
@ -100,7 +102,17 @@ func nonConcurrentUpdateHandler(dest string) func(http.ResponseWriter, *http.Req
default:
hash = sha256.New()
}
if err := streamRequestTo(dest, io.TeeReader(r.Body, hash)); err != nil {
rd := io.Reader(r.Body)
if strings.EqualFold(r.Header.Get("Content-Encoding"), "zstd") {
dec, err := zstd.NewReader(r.Body)
if err != nil {
log.Printf("updating %q failed: %v", dest, err)
http.Error(w, err.Error(), http.StatusInternalServerError)
return
}
rd = dec
}
if err := streamRequestTo(dest, io.TeeReader(rd, hash)); err != nil {
log.Printf("updating %q failed: %v", dest, err)
http.Error(w, err.Error(), http.StatusInternalServerError)
return
@ -133,7 +145,7 @@ func initUpdate() error {
// feature support (e.g. PARTUUID= support) between the packer and update
// target.
http.HandleFunc("/update/features", func(w http.ResponseWriter, r *http.Request) {
fmt.Fprintf(w, "partuuid,updatehash,")
fmt.Fprintf(w, "partuuid,updatehash,zstd,")
})
http.HandleFunc("/update/mbr", nonConcurrentUpdateHandler(rootdev.BlockDevice()))
http.HandleFunc("/update/root", nonConcurrentUpdateHandler(rootdev.Partition(rootdev.InactiveRootPartition())))