From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Tue, 25 Feb 2025 10:50:21 +0000 (+0100)
Subject: Move /work directory cleanup out of remove_files()
X-Git-Tag: v26~352
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=65e7791d36178bcb2e29aed3b5b5342300d6b7c1;p=thirdparty%2Fmkosi.git

Move /work directory cleanup out of remove_files()

This has to be done after running the finalize scripts as a
mkosi.finalize.chroot might recreate the /work directory.
---

diff --git a/mkosi/__init__.py b/mkosi/__init__.py
index b8abba045..8a4607265 100644
--- a/mkosi/__init__.py
+++ b/mkosi/__init__.py
@@ -215,12 +215,12 @@ def mount_base_trees(context: Context) -> Iterator[None]:
 def remove_files(context: Context) -> None:
     """Remove files based on user-specified patterns"""
 
-    if context.config.remove_files or (context.root / "work").exists():
+    if context.config.remove_files:
         with complete_step("Removing files…"):
             remove = flatten(
                 context.root.glob(pattern.lstrip("/")) for pattern in context.config.remove_files
             )
-            rmtree(*remove, context.root / "work", sandbox=context.sandbox)
+            rmtree(*remove, sandbox=context.sandbox)
 
     if context.config.output_format.is_extension_image():
         with complete_step("Removing empty directories…"):
@@ -3951,6 +3951,8 @@ def build_image(context: Context) -> None:
     remove_files(context)
     run_finalize_scripts(context)
 
+    rmtree(context.root / "work")
+
     normalize_mtime(context.root, context.config.source_date_epoch)
     partitions = make_disk(context, skip=("esp", "xbootldr"), tabs=True, msg="Generating disk image")
     install_kernel(context, partitions)