move to zerolog

boot-v2.go

@@ -1,20 +1,20 @@
 package main
 
 import (
-	"log"
 	"os"
 	"os/exec"
 
+	"github.com/rs/zerolog/log"
 	"gopkg.in/yaml.v3"
 
 	config "novit.tech/direktil/pkg/bootstrapconfig"
 )
 
 func bootV2() {
-	log.Print("-- boot v2 --")
+	log.Info().Msg("-- boot v2 --")
 
 	kernelVersion := unameRelease()
-	log.Print("Linux version ", kernelVersion)
+	log.Info().Str("version", kernelVersion).Msg("Linux")
 
 	cfg := &config.Config{}
 
@@ -32,15 +32,19 @@ func bootV2() {
 		}
 	}
 
-	log.Print("config loaded")
-	log.Printf("\n\nanti-phishing code: %q\n", cfg.AntiPhishingCode)
+	log.Info().Msg("config loaded")
+
+	if cfg.AntiPhishingCode != "" {
+		log.Info().Str("anti-phishing-code", cfg.AntiPhishingCode).Send()
+	}
 
 	auths = cfg.Auths
 
 	// mount kernel modules
 	if cfg.Modules == "" {
-		log.Print("NOT mounting modules (nothing specified)")
+		log.Warn().Msg("NOT mounting modules (\"modules:\" not specified)")
 	} else {
+		log.Info().Str("from", cfg.Modules).Msg("mounting modules")
 		mountSquahfs(cfg.Modules, "/modules")
 
 		modulesSourcePath := "/modules/lib/modules/" + kernelVersion
@@ -55,19 +59,23 @@ func bootV2() {
 	}
 
 	// load basic modules
-	run("modprobe", "unix")
+	for _, module := range []string{"unix"} {
+		log.Info().Str("module", module).Msg("loading module")
+		run("modprobe", module)
+	}
 
 	// devices init
+	log.Info().Msg("starting udevd")
 	err := exec.Command("udevd").Start()
 	if err != nil {
 		fatal("failed to start udevd: ", err)
 	}
 
-	log.Print("udevadm triggers")
+	log.Info().Msg("udevadm triggers")
 	run("udevadm", "trigger", "-c", "add", "-t", "devices")
 	run("udevadm", "trigger", "-c", "add", "-t", "subsystems")
 
-	log.Print("udevadm settle")
+	log.Info().Msg("udevadm settle")
 	run("udevadm", "settle")
 
 	// networks