From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Sun, 30 Mar 2025 15:15:32 +0000 (+0200)
Subject: Do not make directory, none and oci images bootable by default
X-Git-Tag: v26~285^2~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d705971365b0611ef04748dce89e367aef6a78ae;p=thirdparty%2Fmkosi.git

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 1e8e3a02b..6f112b854 100644
--- 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 6cfd27eb8..34170a360 100644
--- 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