From cf627bc22d5981cbf503ffd1af1cb3e721620dab Mon Sep 17 00:00:00 2001
From: Leonard Cohnen <lc@edgeless.systems>
Date: Fri, 28 Oct 2022 19:23:57 +0200
Subject: [PATCH] bootstrapper: undefine -v flag to avoid collision

---
 bootstrapper/cmd/bootstrapper/main.go | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/bootstrapper/cmd/bootstrapper/main.go b/bootstrapper/cmd/bootstrapper/main.go
index 7518e9c36..590392b2a 100644
--- a/bootstrapper/cmd/bootstrapper/main.go
+++ b/bootstrapper/cmd/bootstrapper/main.go
@@ -49,9 +49,12 @@ const (
 
 func main() {
 	gRPCDebug := flag.Bool("debug", false, "Enable gRPC debug logging")
-	verbosity := flag.Int("v", 0, logger.CmdLineVerbosityDescription)
+
+	// FIXME: define flag again once its definition no longer collides with glog.
+	// This should happen as soon as https://github.com/google/go-sev-guest/issues/23 is merged and consumed by us.
+	verbosity := 0 // flag.Int("v", 0, logger.CmdLineVerbosityDescription)
 	flag.Parse()
-	log := logger.New(logger.JSONLog, logger.VerbosityFromInt(*verbosity)).Named("bootstrapper")
+	log := logger.New(logger.JSONLog, logger.VerbosityFromInt(verbosity)).Named("bootstrapper")
 	defer log.Sync()
 
 	if *gRPCDebug {