From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Tue, 30 May 2023 11:40:21 +0000 (+0200)
Subject: Use repart's new --architecture option
X-Git-Tag: v15~136
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ab41cfbc18e0f59c2233e383ee04ec17047fb001;p=thirdparty%2Fmkosi.git

Use repart's new --architecture option

This makes sure that --architecture works with user specified repart
configs as well instead of just the ones that we generate ourselves.
---

diff --git a/mkosi/__init__.py b/mkosi/__init__.py
index 17b3f38e2..4f1300a1b 100644
--- a/mkosi/__init__.py
+++ b/mkosi/__init__.py
@@ -1595,6 +1595,8 @@ def invoke_repart(state: MkosiState, skip: Sequence[str] = [], split: bool = Fal
         state.staging / state.config.output_with_format,
     ]
 
+    if not state.config.architecture.is_native():
+        cmdline += ["--architecture", str(state.config.architecture)]
     if not state.staging.joinpath(state.config.output_with_format).exists():
         cmdline += ["--empty=create"]
     if state.config.passphrase:
@@ -1642,7 +1644,7 @@ def invoke_repart(state: MkosiState, skip: Sequence[str] = [], split: bool = Fal
                 dedent(
                     f"""\
                     [Partition]
-                    Type=root-{state.config.architecture}
+                    Type=root
                     Format={state.installer.filesystem()}
                     CopyFiles=/
                     Minimize=guess