Configure the mutable systemd unit path when required

svanderburg · svanderburg · commit 52f7ec87aecb · 2021-06-09T23:44:13.000+02:00
diff --git a/nixproc/backends/systemd/test-module/default.nix b/nixproc/backends/systemd/test-module/default.nix
@@ -16,7 +16,8 @@ in
 {
   inherit (profileSettings) params;
 
-  nixosModules = pkgs.lib.optional profileSettings.params.forceDisableUserChange ./xserver-autologin-module.nix;
+  nixosModules = pkgs.lib.optional profileSettings.params.forceDisableUserChange ./xserver-autologin-module.nix
+    ++ pkgs.lib.optional (!profileSettings.params.forceDisableUserChange) ./systemd-path.nix;
 
   systemPackages = [
     tools.systemd
diff --git a/nixproc/backends/systemd/test-module/systemd-path.nix b/nixproc/backends/systemd/test-module/systemd-path.nix
@@ -0,0 +1,5 @@
+{...}:
+
+{
+  boot.extraSystemdUnitPaths = [ "/etc/systemd-mutable/system" ];
+}
diff --git a/tests/webapps-agnostic-systemd.nix b/tests/webapps-agnostic-systemd.nix
@@ -44,6 +44,8 @@ makeTest {
       virtualisation.writableStore = true;
       virtualisation.memorySize = 1024;
 
+      boot.extraSystemdUnitPaths = [ "/etc/systemd-mutable/system" ];
+
       # We can't download any substitutes in a test environment. To make tests
       # faster, we disable substitutes so that Nix does not waste any time by
       # attempting to download them.

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,8 @@ in`
`16`	`16`	`{`
`17`	`17`	`inherit (profileSettings) params;`
`18`	`18`
`19`		`- nixosModules = pkgs.lib.optional profileSettings.params.forceDisableUserChange ./xserver-autologin-module.nix;`
	`19`	`+ nixosModules = pkgs.lib.optional profileSettings.params.forceDisableUserChange ./xserver-autologin-module.nix`
	`20`	`+ ++ pkgs.lib.optional (!profileSettings.params.forceDisableUserChange) ./systemd-path.nix;`
`20`	`21`
`21`	`22`	`systemPackages = [`
`22`	`23`	`tools.systemd`
-Original file line number
+Diff line change
 +{...}:
++
 +{
 +  boot.extraSystemdUnitPaths = [ "/etc/systemd-mutable/system" ];
 +}