]> git.ipfire.org Git - thirdparty/mkosi.git/commitdiff
mkosi/config: show deprecated *Exlude options only if set
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Wed, 19 Mar 2025 10:26:00 +0000 (11:26 +0100)
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Wed, 19 Mar 2025 12:01:34 +0000 (13:01 +0100)
Those settings were deprecated in the docs, so only show them
in the Summary output if they are set to make them less prominent.

mkosi/config.py

index 71a6774e291b23cfcd27242ac35871bb9c6b389c..8a80e9783f03a766c014dc8bd5467ab7f2c586dd 100644 (file)
@@ -5129,14 +5129,34 @@ def summary(config: Config) -> str:
                              Splash: {none_to_none(config.splash)}
                 Kernel Command Line: {line_join_list(config.kernel_command_line)}
                      Kernel Modules: {line_join_list(config.kernel_modules_include)}
+"""
+
+    if config.kernel_modules_exclude:
+        summary += f"""\
              Kernel Modules Exclude: {line_join_list(config.kernel_modules_exclude)}
+"""
+
+    summary += f"""\
         Kernel Modules Include Host: {yes_no(config.kernel_modules_include_host)}
                      Firmware Files: {line_join_list(config.firmware_include)}
+"""
+
+    if config.firmware_exclude:
+        summary += f"""\
              Firmware Files Exclude: {line_join_list(config.firmware_exclude)}
+"""
 
+    summary += f"""\
               Kernel Modules Initrd: {yes_no(config.kernel_modules_initrd)}
               Kernel Initrd Modules: {line_join_list(config.kernel_modules_initrd_include)}
+"""
+
+    if config.kernel_modules_initrd_exclude:
+        summary += f"""\
       Kernel Modules Initrd Exclude: {line_join_list(config.kernel_modules_initrd_exclude)}
+"""
+
+    summary += f"""\
  Kernel Modules Initrd Include Host: {yes_no(config.kernel_modules_initrd_include_host)}
 
                              Locale: {none_to_default(config.locale)}