From: Michael Ferrari <nekkodroid404@gmail.com>
Date: Fri, 18 Oct 2024 09:08:04 +0000 (+0200)
Subject: Move copy_nspawn_settings
X-Git-Tag: v25~208^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=17af23e9e015e75cfa1e1123575cd2edd067ad96;p=thirdparty%2Fmkosi.git

Move copy_nspawn_settings
---

diff --git a/mkosi/__init__.py b/mkosi/__init__.py
index 2210b3918..a3f653182 100644
--- a/mkosi/__init__.py
+++ b/mkosi/__init__.py
@@ -2144,6 +2144,14 @@ def maybe_compress(
                 run(cmd, stdin=i, stdout=o, sandbox=context.sandbox(binary=cmd[0]))
 
 
+def copy_nspawn_settings(context: Context) -> None:
+    if context.config.nspawn_settings is None:
+        return None
+
+    with complete_step("Copying nspawn settings file…"):
+        shutil.copy2(context.config.nspawn_settings, context.staging / context.config.output_nspawn_settings)
+
+
 def copy_uki(context: Context) -> None:
     if (context.staging / context.config.output_split_uki).exists():
         return
@@ -2189,14 +2197,6 @@ def copy_vmlinuz(context: Context) -> None:
         break
 
 
-def copy_nspawn_settings(context: Context) -> None:
-    if context.config.nspawn_settings is None:
-        return None
-
-    with complete_step("Copying nspawn settings file…"):
-        shutil.copy2(context.config.nspawn_settings, context.staging / context.config.output_nspawn_settings)
-
-
 def copy_initrd(context: Context) -> None:
     if not want_initrd(context):
         return