From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Sun, 7 May 2023 13:16:31 +0000 (+0200)
Subject: arch: Always exclude initramfs generator if we're doing a bootable image
X-Git-Tag: v15~177^2~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3ed368ed981926f6fee248af40ee569d5135bbf4;p=thirdparty%2Fmkosi.git

arch: Always exclude initramfs generator if we're doing a bootable image

The current condition is wrong as we'll generate an initrd ourselves
if none are provided by the user, so update the condition to not install
initramfs generators unless generating a bootable image is explicitly
disabled.
---

diff --git a/mkosi/distributions/arch.py b/mkosi/distributions/arch.py
index 84de6c8bc..1fce9b32e 100644
--- a/mkosi/distributions/arch.py
+++ b/mkosi/distributions/arch.py
@@ -3,6 +3,7 @@
 from collections.abc import Sequence
 from textwrap import dedent
 
+from mkosi.config import ConfigFeature
 from mkosi.distributions import DistributionInstaller
 from mkosi.run import bwrap
 from mkosi.state import MkosiState
@@ -94,7 +95,9 @@ def invoke_pacman(state: MkosiState, packages: Sequence[str], apivfs: bool = Tru
         "-Sy", *sort_packages(packages),
     ]
 
-    if state.config.initrds:
+    # If we're generating a bootable image, we'll do so with a prebuilt initramfs, so no need for an
+    # initramfs generator.
+    if state.config.bootable != ConfigFeature.disabled:
         cmdline += ["--assume-installed", "initramfs"]
 
     bwrap(cmdline, apivfs=state.root if apivfs else None, env=dict(KERNEL_INSTALL_BYPASS="1") | state.environment)