From 7123f0fcad33cbc642de25eda5160504f66ed326 Mon Sep 17 00:00:00 2001
From: Moritz Sanft <58110325+msanft@users.noreply.github.com>
Date: Mon, 3 Jun 2024 15:37:59 +0200
Subject: [PATCH] bootstrapper: remove debug flag

---
 bootstrapper/cmd/bootstrapper/main.go          | 18 +++++-------------
 .../system/constellation-bootstrapper.service  |  2 +-
 2 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/bootstrapper/cmd/bootstrapper/main.go b/bootstrapper/cmd/bootstrapper/main.go
index 72ac52704..23b2cf474 100644
--- a/bootstrapper/cmd/bootstrapper/main.go
+++ b/bootstrapper/cmd/bootstrapper/main.go
@@ -43,22 +43,14 @@ const (
 )
 
 func main() {
-	debug := flag.Bool("debug", false, "Enable debug logging")
-	gRPCDebug := flag.Bool("grpc-debug", false, "Enable gRPC debug logging")
 	verbosity := flag.Int("v", 0, logger.CmdLineVerbosityDescription)
 	flag.Parse()
 	log := logger.NewJSONLogger(logger.VerbosityFromInt(*verbosity)).WithGroup("bootstrapper")
-
-	level := slog.LevelWarn
-	if *debug {
-		level = slog.LevelDebug
-	}
-
-	if *gRPCDebug {
-		logger.ReplaceGRPCLogger(log.WithGroup("gRPC"))
-	} else {
-		logger.ReplaceGRPCLogger(slog.New(logger.NewLevelHandler(level, log.Handler())).WithGroup("gRPC"))
-	}
+	logger.ReplaceGRPCLogger(
+		slog.New(
+			logger.NewLevelHandler(logger.VerbosityFromInt(*verbosity), log.Handler()),
+		).WithGroup("gRPC"),
+	)
 
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
diff --git a/image/base/mkosi.skeleton/usr/lib/systemd/system/constellation-bootstrapper.service b/image/base/mkosi.skeleton/usr/lib/systemd/system/constellation-bootstrapper.service
index 76ef974ce..cf93df780 100644
--- a/image/base/mkosi.skeleton/usr/lib/systemd/system/constellation-bootstrapper.service
+++ b/image/base/mkosi.skeleton/usr/lib/systemd/system/constellation-bootstrapper.service
@@ -10,7 +10,7 @@ RemainAfterExit=yes
 Restart=on-failure
 EnvironmentFile=/run/constellation.env
 Environment=PATH=/run/state/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin
-ExecStart=/usr/bin/bootstrapper $CONSTELLATION_DEBUG_FLAGS
+ExecStart=/usr/bin/bootstrapper
 
 [Install]
 WantedBy=multi-user.target