From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Mon, 6 Nov 2023 11:05:25 +0000 (+0100)
Subject: Use same chroot scripts for all postinst/finalize scripts
X-Git-Tag: v19~26^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ba6e53e061a30336b0cb7d38ed78c1cc50739bde;p=thirdparty%2Fmkosi.git

Use same chroot scripts for all postinst/finalize scripts
---

diff --git a/mkosi/__init__.py b/mkosi/__init__.py
index d38c718c4..42d62d350 100644
--- a/mkosi/__init__.py
+++ b/mkosi/__init__.py
@@ -528,8 +528,8 @@ def run_postinst_scripts(state: MkosiState) -> None:
         SRCDIR=str(Path.cwd()),
     )
 
-    for script in state.config.postinst_scripts:
-        with finalize_chroot_scripts(state) as cd:
+    with finalize_chroot_scripts(state) as cd:
+        for script in state.config.postinst_scripts:
             helpers = {
                 "mkosi-chroot": chroot_cmd(
                     state.root,
@@ -578,8 +578,8 @@ def run_finalize_scripts(state: MkosiState) -> None:
         SRCDIR=str(Path.cwd()),
     )
 
-    for script in state.config.finalize_scripts:
-        with finalize_chroot_scripts(state) as cd:
+    with finalize_chroot_scripts(state) as cd:
+        for script in state.config.finalize_scripts:
             helpers = {
                 "mkosi-chroot": chroot_cmd(
                     state.root,