Return false from want_efi() for UKI outputs

This may seem counter intuitive, but we do not want to make UKIs
bootable on EFI firmware. Making stuff bootable on EFI firmware involves
installing systemd-boot and shim and other things which aren't required
when building a UKI, so let's return false for UKIs from want_efi() unless
explicitly requested.

Fixes #3846

diff --git a/mkosi/bootloader.py b/mkosi/bootloader.py
index 457f9dc8df3476e5863ae360114d66b80db9165d..d308a4133b7e69e10abe929caa95b168135ee9be 100644 (file)
--- a/mkosi/bootloader.py
+++ b/mkosi/bootloader.py
@@ -40,7 +40,7 @@ def want_efi(config: Config) -> bool:
     # Note that this returns True also in the case where autodetection might later cause the system to not be
     # made bootable on EFI firmware after the filesystem has been populated.
 
-    if config.output_format in (OutputFormat.uki, OutputFormat.esp):
+    if config.output_format == OutputFormat.esp:
         return True
 
     if config.bootable == ConfigFeature.disabled:
@@ -51,7 +51,7 @@ def want_efi(config: Config) -> bool:
 
     if (
         config.output_format
-        in (OutputFormat.cpio, OutputFormat.directory, OutputFormat.none, OutputFormat.oci)
+        in (OutputFormat.cpio, OutputFormat.directory, OutputFormat.none, OutputFormat.oci, OutputFormat.uki)
         or config.output_format.is_extension_or_portable_image()
         or config.overlay
     ) and config.bootable == ConfigFeature.auto: