Do not make directory, none and oci images bootable by default

It's more likely to not want these bootable, so let's default to that
and drop the explicit disablement from mkosi-tools at the same time.

diff --git a/mkosi/bootloader.py b/mkosi/bootloader.py
index 1e8e3a02b28251d77d5a4a973ebd5c846321ca36..6f112b854f72a8863dc5e7348f0154851d3dda96 100644 (file)
--- a/mkosi/bootloader.py
+++ b/mkosi/bootloader.py
@@ -50,7 +50,8 @@ def want_efi(config: Config) -> bool:
         return False
 
     if (
-        config.output_format == OutputFormat.cpio
+        config.output_format
+        in (OutputFormat.cpio, OutputFormat.directory, OutputFormat.none, OutputFormat.oci)
         or config.output_format.is_extension_or_portable_image()
         or config.overlay
     ) and config.bootable == ConfigFeature.auto:

diff --git a/mkosi/resources/mkosi-tools/mkosi.conf b/mkosi/resources/mkosi-tools/mkosi.conf
index 6cfd27eb8416cdf0683bc28962b51752a1c87e8b..34170a360f3e9b2f154cee9507a313d85554cd64 100644 (file)
--- a/mkosi/resources/mkosi-tools/mkosi.conf
+++ b/mkosi/resources/mkosi-tools/mkosi.conf
@@ -5,7 +5,6 @@ Format=directory
 Output=mkosi.tools
 
 [Content]
-Bootable=no
 Packages=
         ca-certificates
         coreutils