Merge master into staging-next

2025-01-16 18:04:20 +00:00
parent 65385c1e4f 0bda27c93d
commit 31193d78d8
78 changed files with 1052 additions and 1754 deletions
--- a/nixos/modules/system/boot/systemd/tmpfiles.nix
+++ b/nixos/modules/system/boot/systemd/tmpfiles.nix
@@ -322,7 +322,7 @@ in
        description = "Create Volatile Files and Directories in the Real Root";
        after = [ "initrd-fs.target" ];
        before = [
-          "initrd-nixos-activation.service"
+          "initrd.target"
          "shutdown.target" "initrd-switch-root.target"
        ];
        conflicts = [ "shutdown.target" "initrd-switch-root.target" ];