From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Tue, 7 Feb 2023 13:45:02 +0000 (+0100)
Subject: Run preset-all on the final image
X-Git-Tag: v15~342
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=84ec58cca8e3cb3e4b7592dc928a29d63bfa4d78;p=thirdparty%2Fmkosi.git

Run preset-all on the final image

Let's run preset-all on the finalized image so that read-only
images (e.g. initrds) have the preset settings configured in the
image itself at creation time.
---

diff --git a/mkosi/__init__.py b/mkosi/__init__.py
index 86e05493a..ac749946f 100644
--- a/mkosi/__init__.py
+++ b/mkosi/__init__.py
@@ -3391,6 +3391,14 @@ def run_kernel_install(state: MkosiState, cached: bool) -> None:
             run_workspace_command(state, ["kernel-install", "add", kver, Path("/") / kimg])
 
 
+def run_preset_all(state: MkosiState) -> None:
+    if state.for_cache or state.do_run_build_script:
+        return
+
+    with complete_step("Applying presets…"):
+        run(["systemctl", "--root", state.root, "preset-all"])
+
+
 def reuse_cache_tree(state: MkosiState) -> bool:
     if not state.config.incremental:
         return False
@@ -3518,6 +3526,7 @@ def build_image(state: MkosiState, *, manifest: Optional[Manifest] = None) -> No
         install_boot_loader(state)
         configure_ssh(state, cached)
         run_postinst_script(state)
+        run_preset_all(state)
         secure_boot_configure_auto_enroll(state)
         # Sign systemd-boot / sd-boot EFI binaries
         secure_boot_sign(state, state.root / 'usr/lib/systemd/boot/efi')