Skip setting kernel root cmdline parameter for UsrOnly with ImageID and without verity

When an image is built as a /usr only image and does not use verity, the kernel
command line should (and already does) contain the parameter `mount.usr`. It
should not contain a root parameter since `systemd-repart` and
`systemd-gpt-auto-generator` will take care of generating and mounting the root
partition.

Without this change the root partition label used on the kernel command line
will be invalid.

diff --git a/mkosi/__init__.py b/mkosi/__init__.py
index 9cce217a529da1fa0e59205f87226aa4796d4a93..4d8be448f35df413506750a4d2abba37344586ab 100644 (file)
--- a/mkosi/__init__.py
+++ b/mkosi/__init__.py
@@ -4078,7 +4078,8 @@ def install_unified_kernel(
                 option = "usrhash" if args.usr_only else "roothash"
                 boot_options = f"{boot_options} {option}={root_hash}"
             elif partlabel:
-                boot_options = f"{boot_options} root=PARTLABEL={partlabel}"
+                option = "mount.usr" if args.usr_only else "root"
+                boot_options = f"{boot_options} {option}=PARTLABEL={partlabel}"
 
             osrelease = root / "usr/lib/os-release"
             cmdline = workspace(root) / "cmdline"