diff options
| author | nikstur <nikstur@outlook.com> | 2023-12-27 08:33:26 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-27 08:33:26 +0100 |
| commit | c9569af3e095e0b146c0806dd2f2ae1f28f0736d (patch) | |
| tree | 5c6d66f9ea192bada94736e0e5d1fecf3c9a0532 /nixos/modules/config | |
| parent | 56b8564a7d018564d5a58bce4c9dc997ae7d7ac0 (diff) | |
| parent | 6f8091159ecec673fcafea1215ba190a86c99ebd (diff) | |
Merge pull request #271326 from philiptaron/shutdown.target
treewide: depend on `shutdown.target` if `DefaultDependencies=no` in almost every case
Diffstat (limited to 'nixos/modules/config')
| -rw-r--r-- | nixos/modules/config/swap.nix | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/nixos/modules/config/swap.nix b/nixos/modules/config/swap.nix index 8989a64082643..21046d6f1697b 100644 --- a/nixos/modules/config/swap.nix +++ b/nixos/modules/config/swap.nix @@ -258,7 +258,8 @@ in # avoid this race condition. after = [ "systemd-modules-load.service" ]; wantedBy = [ "${realDevice'}.swap" ]; - before = [ "${realDevice'}.swap" ]; + before = [ "${realDevice'}.swap" "shutdown.target"]; + conflicts = [ "shutdown.target" ]; path = [ pkgs.util-linux pkgs.e2fsprogs ] ++ optional sw.randomEncryption.enable pkgs.cryptsetup; |