From: Nick Labich <nick@labich.org>
Date: Thu, 11 Jul 2024 07:08:25 +0000 (-0400)
Subject: Fix partition identification for mount.usr=PARTUUID
X-Git-Tag: v24~40
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e7cd60d391c1e03c77bab8de043627e9c8d0895f;p=thirdparty%2Fmkosi.git

Fix partition identification for mount.usr=PARTUUID
---

diff --git a/mkosi/__init__.py b/mkosi/__init__.py
index 82a19f528..4fe6c1047 100644
--- a/mkosi/__init__.py
+++ b/mkosi/__init__.py
@@ -2296,7 +2296,8 @@ def finalize_cmdline(context: Context, partitions: Sequence[Partition], roothash
 
     if not roothash:
         for name in ("root", "mount.usr"):
-            if not (root := next((p.uuid for p in partitions if p.type.startswith(name)), None)):
+            type_prefix = name.removeprefix("mount.")
+            if not (root := next((p.uuid for p in partitions if p.type.startswith(type_prefix)), None)):
                 continue
 
             cmdline = [f"{name}=PARTUUID={root}" if c == f"{name}=PARTUUID" else c for c in cmdline]