]> git.ipfire.org Git - thirdparty/mkosi.git/commitdiff
Check whether ukify is available in want_uki()
authorDaan De Meyer <daan.j.demeyer@gmail.com>
Sun, 17 Mar 2024 13:26:36 +0000 (14:26 +0100)
committerDaan De Meyer <daan.j.demeyer@gmail.com>
Sun, 17 Mar 2024 13:28:48 +0000 (14:28 +0100)
mkosi/__init__.py

index 17e53743f0c3990e08d669898923fd878199a3e9..ef992a52af7fa83d98ba3d05cd4369de725a5ea0 100644 (file)
@@ -2034,9 +2034,12 @@ def systemd_stub_binary(context: Context) -> Path:
 
 def want_uki(context: Context) -> bool:
     return want_efi(context.config) and (
-        context.config.bootloader == Bootloader.uki or
-        context.config.unified_kernel_images == ConfigFeature.enabled or
-        (context.config.unified_kernel_images == ConfigFeature.auto and systemd_stub_binary(context).exists())
+            context.config.bootloader == Bootloader.uki or
+            context.config.unified_kernel_images == ConfigFeature.enabled or (
+                context.config.unified_kernel_images == ConfigFeature.auto and
+                systemd_stub_binary(context).exists() and
+                find_binary("ukify", "/usr/lib/systemd/ukify", root=context.config.tools()) is not None
+            )
     )