Merge pull request #553 from nix-community/systemd-cycle

Fix cyclic dependency in systemd units. Add test to check for that

flake.nix

@@ -109,6 +109,7 @@
               clippy
               mdbook
               nixpkgs-fmt
+              powershell
               rustc
               rustfmt
               shfmt

modules/wsl-distro.nix

@@ -119,15 +119,17 @@ in
       where = "/tmp/.X11-unix/X0";
       type = "none";
       options = "bind";
-      wantedBy = [ "local-fs.target" ];
       after = [ "nixos-wsl-migration-x11mount.service" ];
       wants = after;
+      wantedBy = [ "local-fs.target" ];
     }];
     # Remove symbolic link for WSLg X11 socket, which was created by NixOS-WSL until 2024-02-24
     systemd.services.nixos-wsl-migration-x11mount = {
       description = "Remove /tmp/.X11-unix symlink if present";
-      before = [ "tmp-.X11\x2dunix-X0.mount" ];
-      unitConfig.ConditionPathIsSymbolicLink = "/tmp/.X11-unix";
+      unitConfig = {
+        ConditionPathIsSymbolicLink = "/tmp/.X11-unix";
+        DefaultDependencies = "no";
+      };
       serviceConfig = {
         Type = "oneshot";
         RemainAfterExit = true;

tests/systemd-services.Tests.ps1

@@ -8,14 +8,21 @@ Describe "Systemd Services" {
   }
 
   It "should boot" {
-    $distro.Launch("true")
+    $output = $distro.Launch("systemctl is-system-running") | Remove-Escapes
     $LASTEXITCODE | Should -Be 0
+    $output | Should -BeExactly "running"
   }
 
   It "should not have any failed unit" {
     $output = $distro.Launch("sudo systemctl list-units --failed") | Remove-Escapes
+    $LASTEXITCODE | Should -Be 0
     $output | Where-Object { $_.trim() -ne "" } | Select-Object -Last 1 | Should -BeExactly "0 loaded units listed."
+  }
+
+  It "should not have any systemd-analyze verify warnings" {
+    $output = $distro.Launch("sudo systemd-analyze verify multi-user.target --no-pager 2>&1") | Remove-Escapes
     $LASTEXITCODE | Should -Be 0
+    $output | Should -BeExactly ""
   }
 
   AfterAll {