From: Michael A Cassaniti <michael@cassaniti.id.au>
Date: Mon, 1 May 2023 00:16:04 +0000 (+1000)
Subject: repart: Support mkfs options from configured environment
X-Git-Tag: v15~189
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7012001987f39b5ccd5a796af1ef1de7e7d9ef27;p=thirdparty%2Fmkosi.git

repart: Support mkfs options from configured environment
---

diff --git a/mkosi/__init__.py b/mkosi/__init__.py
index e8322779c..fdd53d628 100644
--- a/mkosi/__init__.py
+++ b/mkosi/__init__.py
@@ -1488,6 +1488,10 @@ def invoke_repart(state: MkosiState, skip: Sequence[str] = [], split: bool = Fal
     for fs, options in state.installer.filesystem_options(state).items():
         env[f"SYSTEMD_REPART_MKFS_OPTIONS_{fs.upper()}"] = " ".join(options)
 
+    for option, value in state.environment.items():
+        if option.startswith("SYSTEMD_REPART_MKFS_OPTIONS_"):
+            env[option] = value
+
     with complete_step("Generating disk image"):
         output = json.loads(run(cmdline, stdout=subprocess.PIPE, env=env).stdout)