From 7ba279d21ece354fe6385eaf77e86268bf8c4c24 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kier=C3=A1n=20Meinhardt?=
 <kieran.meinhardt@applicative.systems>
Date: Mon, 5 Jan 2026 11:45:49 +0100
Subject: [PATCH] nixos/nspawn-container: rename initArgs to cmdline

---
 nixos/modules/virtualisation/nspawn-container/default.nix     | 4 ++--
 .../nspawn-container/run-nspawn/src/run_nspawn/__init__.py    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/virtualisation/nspawn-container/default.nix b/nixos/modules/virtualisation/nspawn-container/default.nix
index a04120d277dd..f7f7016289e0 100644
--- a/nixos/modules/virtualisation/nspawn-container/default.nix
+++ b/nixos/modules/virtualisation/nspawn-container/default.nix
@@ -120,7 +120,7 @@ in
       default = vlansNumbered // cfg.interfaces;
     };
 
-    virtualisation.initArgs = lib.mkOption {
+    virtualisation.cmdline = lib.mkOption {
       type = types.listOf types.str;
       default = [ ];
       example = [
@@ -249,7 +249,7 @@ in
             interfaces=${toPythonExpression (lib.attrValues cfg.allInterfaces)},  # noqa
             nspawn_options=${toPythonExpression config.virtualisation.systemd-nspawn.options} + sys.argv[1:],  # noqa
             init=${toPythonStr "${config.system.build.toplevel}/init"},  # noqa
-            init_args=${toPythonExpression cfg.initArgs},  # noqa
+            cmdline=${toPythonExpression cfg.cmdline},  # noqa
           )
         '';
   };
diff --git a/nixos/modules/virtualisation/nspawn-container/run-nspawn/src/run_nspawn/__init__.py b/nixos/modules/virtualisation/nspawn-container/run-nspawn/src/run_nspawn/__init__.py
index 76b1d414f732..333bd5634366 100644
--- a/nixos/modules/virtualisation/nspawn-container/run-nspawn/src/run_nspawn/__init__.py
+++ b/nixos/modules/virtualisation/nspawn-container/run-nspawn/src/run_nspawn/__init__.py
@@ -130,7 +130,7 @@ def run(
     interfaces: dict,
     nspawn_options: list[str],
     init: str,
-    init_args: list[str],
+    cmdline: list[str],
 ) -> None:
     logging.basicConfig(
         format=f"nixos-nspawn({container_name}): %(message)s",
@@ -174,7 +174,7 @@ def run(
                 f"--directory={root_dir}",
                 f"--network-namespace-path={netns.path}",
                 init,
-                *init_args,
+                *cmdline,
             ],
             preexec_fn=print_pid,
         )