From fa11c3e9d0bca9bc547888553e393aca1910c463 Mon Sep 17 00:00:00 2001
From: Will Fancher <elvishjerricco@gmail.com>
Date: Tue, 29 Jul 2025 02:17:58 -0400
Subject: [PATCH] nixos/tests/systemd: Reuse intentional settings, not the
 entire Manager section

---
 nixos/modules/testing/test-instrumentation.nix | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/nixos/modules/testing/test-instrumentation.nix b/nixos/modules/testing/test-instrumentation.nix
index 89d3b9d5277c..5afdcc868a3f 100644
--- a/nixos/modules/testing/test-instrumentation.nix
+++ b/nixos/modules/testing/test-instrumentation.nix
@@ -72,6 +72,14 @@ let
     serviceConfig.KillSignal = "SIGHUP";
   };
 
+  managerSettings = {
+    # Don't clobber the console with duplicate systemd messages.
+    ShowStatus = false;
+    # Allow very slow start
+    DefaultTimeoutStartSec = 300;
+    DefaultDeviceTimeoutSec = 300;
+  };
+
 in
 
 {
@@ -115,7 +123,7 @@ in
           MaxLevelConsole=debug
         '';
 
-        settings.Manager = config.systemd.settings.Manager;
+        settings.Manager = managerSettings;
       }
 
       (lib.mkIf cfg.initrdBackdoor {
@@ -210,13 +218,7 @@ in
       MaxLevelConsole=debug
     '';
 
-    systemd.settings.Manager = {
-      # Don't clobber the console with duplicate systemd messages.
-      ShowStatus = false;
-      # Allow very slow start
-      DefaultTimeoutStartSec = 300;
-      DefaultDeviceTimeoutSec = 300;
-    };
+    systemd.settings.Manager = managerSettings;
     systemd.user.extraConfig = ''
       # Allow very slow start
       DefaultTimeoutStartSec=300