direktil/local-server
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

clear initrd-v2 flag, use config

Browse Source
This commit is contained in:
Mikaël Cluseau 2023-11-27 15:46:58 +01:00
parent 29ed01a19f
commit 7f429a863d
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cmd/dkl-local-server/bootv2.go
View File

@ -3,7 +3,6 @@ package main
import ( import (
"archive/tar" "archive/tar"
"encoding/json" "encoding/json"
"flag"
"fmt" "fmt"
"io" "io"
"log" "log"
@ -15,8 +14,6 @@ import (
"novit.tech/direktil/pkg/cpiocat" "novit.tech/direktil/pkg/cpiocat"
) )
var initrdV2 = flag.String("initrd-v2", "2.1.0", "initrd V2 version (temporary flag)") // FIXME
func renderBootstrapConfig(w http.ResponseWriter, r *http.Request, ctx *renderContext, asJson bool) (err error) { func renderBootstrapConfig(w http.ResponseWriter, r *http.Request, ctx *renderContext, asJson bool) (err error) {
log.Printf("sending bootstrap config for %q", ctx.Host.Name) log.Printf("sending bootstrap config for %q", ctx.Host.Name)
@ -43,7 +40,7 @@ func buildInitrd(out io.Writer, ctx *renderContext) (err error) {
cat := cpiocat.New(out) cat := cpiocat.New(out)
// initrd // initrd
initrdPath, err := ctx.distFetch("initrd", *initrdV2) initrdPath, err := ctx.distFetch("initrd", ctx.Host.Initrd)
if err != nil { if err != nil {
return return
} }

2
modd.conf
View File

@ -14,7 +14,7 @@ html/**/* {
dist/dkl-local-server { dist/dkl-local-server {
prep: mkdir -p tmp prep: mkdir -p tmp
daemon +sigterm: dist/dkl-local-server -data tmp -auto-unlock test #daemon +sigterm: dist/dkl-local-server -data tmp -auto-unlock test
} }
dist/dkl-dir2config { dist/dkl-dir2config {