From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Tue, 12 Mar 2024 17:15:28 +0000 (+0000)
Subject: Drop --verbose from grub tools if --debug is specified
X-Git-Tag: v22~12^2~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=32bc3c867a4b32384e391a19f49e10cb8aa0a0e7;p=thirdparty%2Fmkosi.git

Drop --verbose from grub tools if --debug is specified

This makes grub tools incredibly noisy so let's drop it given
this has been working smoothly for a while now.
---

diff --git a/mkosi/__init__.py b/mkosi/__init__.py
index 20da37510..236aaffcb 100644
--- a/mkosi/__init__.py
+++ b/mkosi/__init__.py
@@ -53,7 +53,7 @@ from mkosi.context import Context
 from mkosi.distributions import Distribution
 from mkosi.installer import clean_package_manager_metadata
 from mkosi.kmod import gen_required_kernel_modules, process_kernel_modules
-from mkosi.log import ARG_DEBUG, complete_step, die, log_notice, log_step
+from mkosi.log import complete_step, die, log_notice, log_step
 from mkosi.manifest import Manifest
 from mkosi.mounts import finalize_source_mounts, mount_overlay
 from mkosi.pager import page
@@ -1266,7 +1266,6 @@ def grub_mkimage(context: Context, *, target: str, modules: Sequence[str] = (),
                 "--prefix", f"/{context.config.distribution.grub_prefix()}",
                 "--output", output or (directory / "core.img"),
                 "--format", target,
-                *(["--verbose"] if ARG_DEBUG.get() else []),
                 "fat",
                 "part_gpt",
                 "search",
@@ -1343,7 +1342,6 @@ def grub_bios_setup(context: Context, partitions: Sequence[Partition]) -> None:
                 "sh", "-c", f"mount --bind {mountinfo.name} /proc/$$/mountinfo && exec $0 \"$@\"",
                 setup,
                 "--directory", directory,
-                *(["--verbose"] if ARG_DEBUG.get() else []),
                 context.staging / context.config.output_with_format,
             ],
             sandbox=context.sandbox(