diff options
| author | Guillaume Girol <symphorien@users.noreply.github.com> | 2022-01-30 16:04:17 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-30 16:04:17 +0000 |
| commit | 0d5c5e46da9967e9311b0b8d249274e7da97e31a (patch) | |
| tree | c9f21ad9477f628e748ffd5f121bffa5ad079e7b /pkgs/os-specific/linux/systemd | |
| parent | c7ec7379d8c608818e193f915d153727cac372c2 (diff) | |
| parent | 4b27d4f9f8f5396d0d6688d567568241e8bc34f9 (diff) | |
| download | nixpkgs-0d5c5e46da9967e9311b0b8d249274e7da97e31a.tar nixpkgs-0d5c5e46da9967e9311b0b8d249274e7da97e31a.tar.gz nixpkgs-0d5c5e46da9967e9311b0b8d249274e7da97e31a.tar.bz2 nixpkgs-0d5c5e46da9967e9311b0b8d249274e7da97e31a.tar.lz nixpkgs-0d5c5e46da9967e9311b0b8d249274e7da97e31a.tar.xz nixpkgs-0d5c5e46da9967e9311b0b8d249274e7da97e31a.tar.zst nixpkgs-0d5c5e46da9967e9311b0b8d249274e7da97e31a.zip | |
Merge pull request #157053 from lheckemann/systemd-optional-cryptsetup
nixos/systemd: only use cryptsetup units if systemd was built with it
Diffstat (limited to 'pkgs/os-specific/linux/systemd')
| -rw-r--r-- | pkgs/os-specific/linux/systemd/default.nix | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index f17dd02e7c0..c2879ed939e 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -594,16 +594,20 @@ stdenv.mkDerivation { rm -rf $out/share/doc ''; - # The interface version prevents NixOS from switching to an - # incompatible systemd at runtime. (Switching across reboots is - # fine, of course.) It should be increased whenever systemd changes - # in a backwards-incompatible way. If the interface version of two - # systemd builds is the same, then we can switch between them at - # runtime; otherwise we can't and we need to reboot. - passthru.interfaceVersion = 2; - - passthru.tests = { - inherit (nixosTests) switchTest; + passthru = { + # The interface version prevents NixOS from switching to an + # incompatible systemd at runtime. (Switching across reboots is + # fine, of course.) It should be increased whenever systemd changes + # in a backwards-incompatible way. If the interface version of two + # systemd builds is the same, then we can switch between them at + # runtime; otherwise we can't and we need to reboot. + interfaceVersion = 2; + + inherit withCryptsetup; + + tests = { + inherit (nixosTests) switchTest; + }; }; meta = with lib; { |