From 222ee8fabfad815e6c988882defe282d1e79dc1a Mon Sep 17 00:00:00 2001 From: Grimmauld Date: Sat, 19 Jul 2025 16:30:08 +0200 Subject: [PATCH] nixos/testing: migrate to systemd.settings.Manager --- nixos/modules/testing/test-instrumentation.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/nixos/modules/testing/test-instrumentation.nix b/nixos/modules/testing/test-instrumentation.nix index 80852be51f1d..89d3b9d5277c 100644 --- a/nixos/modules/testing/test-instrumentation.nix +++ b/nixos/modules/testing/test-instrumentation.nix @@ -115,7 +115,7 @@ in MaxLevelConsole=debug ''; - extraConfig = config.systemd.extraConfig; + settings.Manager = config.systemd.settings.Manager; } (lib.mkIf cfg.initrdBackdoor { @@ -210,13 +210,13 @@ in MaxLevelConsole=debug ''; - systemd.extraConfig = '' + systemd.settings.Manager = { # Don't clobber the console with duplicate systemd messages. - ShowStatus=no + ShowStatus = false; # Allow very slow start - DefaultTimeoutStartSec=300 - DefaultDeviceTimeoutSec=300 - ''; + DefaultTimeoutStartSec = 300; + DefaultDeviceTimeoutSec = 300; + }; systemd.user.extraConfig = '' # Allow very slow start DefaultTimeoutStartSec=300