Simplify KernelInstallContext.parse() a little

diff --git a/kernel-install/50-mkosi.install b/kernel-install/50-mkosi.install
index 68b371b622c4e97e36c820af8838eee6c13f59ed..ec33253a2284069a0ef12c076ef9cb7ad0795e46 100755 (executable)
--- a/kernel-install/50-mkosi.install
+++ b/kernel-install/50-mkosi.install
@@ -52,8 +52,8 @@ def main() -> None:
     log_setup()
 
     context = KernelInstallContext.parse(
-        "kernel-install plugin to build initrds or Unified Kernel Images using mkosi",
-        "50-mkosi.install COMMAND KERNEL_VERSION ENTRY_DIR KERNEL_IMAGE INITRD…",
+        name="50-mkosi.install",
+        description="kernel-install plugin to build initrds or Unified Kernel Images using mkosi",
     )
 
     if context.command != "add" or not we_are_wanted(context):

diff --git a/kernel-install/51-mkosi-addon.install b/kernel-install/51-mkosi-addon.install
index d16e4abf37c16cf4de027301dd687df432ce79e4..7e8302ed5f8dbde481206b131154c8ec6d29854e 100755 (executable)
--- a/kernel-install/51-mkosi-addon.install
+++ b/kernel-install/51-mkosi-addon.install
@@ -16,8 +16,8 @@ def main() -> None:
     log_setup()
 
     context = KernelInstallContext.parse(
-        "kernel-install plugin to build local addon for initrd/cmdline",
-        "51-mkosi-addon.install COMMAND KERNEL_VERSION ENTRY_DIR KERNEL_IMAGE…",
+        name="51-mkosi-addon.install",
+        description="kernel-install plugin to build local addon for initrd/cmdline",
     )
 
     # No local configuration? Then nothing to do

diff --git a/mkosi/initrd.py b/mkosi/initrd.py
index 34294a5e022c2792b7d8360814788eb965397642..751df9fd5f88db5bceb840fdecc3b19a0fdb250f 100644 (file)
--- a/mkosi/initrd.py
+++ b/mkosi/initrd.py
@@ -37,11 +37,11 @@ class KernelInstallContext:
     verbose: bool
 
     @staticmethod
-    def parse(description: str, usage: str) -> "KernelInstallContext":
+    def parse(*, name: str, description: str) -> "KernelInstallContext":
         parser = argparse.ArgumentParser(
             description=description,
             allow_abbrev=False,
-            usage=usage,
+            usage=f"{name} COMMAND KERNEL_VERSION ENTRY_DIR KERNEL_IMAGE…",
         )
 
         parser.add_argument(