From: Joerg Behrmann <behrmann@physik.fu-berlin.de>
Date: Sat, 26 Mar 2022 13:41:43 +0000 (+0100)
Subject: Add missing environments to prepare und postinst scripts
X-Git-Tag: v13~60^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F938%2Fhead;p=thirdparty%2Fmkosi.git

Add missing environments to prepare und postinst scripts

Fixes: #937
---

diff --git a/mkosi/__init__.py b/mkosi/__init__.py
index 3dbbb4f54..68312c736 100644
--- a/mkosi/__init__.py
+++ b/mkosi/__init__.py
@@ -3404,9 +3404,12 @@ def run_postinst_script(
                 raise ValueError("Parameter 'loopdev' required for bootable images.")
             nspawn_params += nspawn_params_for_blockdev_access(args, loopdev)
 
-        run_workspace_command(
-            args, root, ["/root/postinst", verb], network=(args.with_network is True), nspawn_params=nspawn_params
-        )
+        env = dict(cast(Tuple[str, str], v.split("=", maxsplit=1)) for v in args.environment)
+
+        run_workspace_command(args, root, ["/root/postinst", verb],
+                              network=(args.with_network is True),
+                              nspawn_params=nspawn_params,
+                              env=env)
         root_home(args, root).joinpath("postinst").unlink()