]> git.ipfire.org Git - thirdparty/mkosi.git/commitdiff
Use same chroot scripts for all postinst/finalize scripts
authorDaan De Meyer <daan.j.demeyer@gmail.com>
Mon, 6 Nov 2023 11:05:25 +0000 (12:05 +0100)
committerDaan De Meyer <daan.j.demeyer@gmail.com>
Mon, 6 Nov 2023 16:09:34 +0000 (17:09 +0100)
mkosi/__init__.py

index d38c718c46228ead4de895836fac093fed3158d0..42d62d350cd28b5835f1fbb1fb8270df9afc07f3 100644 (file)
@@ -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,