From 7f429a863d8b9eada6e821cc1888b476fbb8d93c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mika=C3=ABl=20Cluseau?= Date: Mon, 27 Nov 2023 15:46:58 +0100 Subject: [PATCH] clear initrd-v2 flag, use config --- cmd/dkl-local-server/bootv2.go | 5 +---- modd.conf | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/cmd/dkl-local-server/bootv2.go b/cmd/dkl-local-server/bootv2.go index 1fc5b6e..bfe4467 100644 --- a/cmd/dkl-local-server/bootv2.go +++ b/cmd/dkl-local-server/bootv2.go @@ -3,7 +3,6 @@ package main import ( "archive/tar" "encoding/json" - "flag" "fmt" "io" "log" @@ -15,8 +14,6 @@ import ( "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) { 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) // initrd - initrdPath, err := ctx.distFetch("initrd", *initrdV2) + initrdPath, err := ctx.distFetch("initrd", ctx.Host.Initrd) if err != nil { return } diff --git a/modd.conf b/modd.conf index 426c157..a318349 100644 --- a/modd.conf +++ b/modd.conf @@ -14,7 +14,7 @@ html/**/* { dist/dkl-local-server { 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 {