diff options
| author | Jan Malakhovski <oxij@oxij.org> | 2015-11-25 19:09:09 +0000 |
|---|---|---|
| committer | Jan Malakhovski <oxij@oxij.org> | 2016-08-23 18:14:05 +0000 |
| commit | 65d26c4dc12f8f0113b6b128573f18492ac5b6f6 (patch) | |
| tree | bcd427c83dab4633c9c4b06c338ac10350f0209e /nixos/modules/tasks/encrypted-devices.nix | |
| parent | 2c8ca0d1bd1df838b3e3b2d2e17c6855b3b520c1 (diff) | |
| download | nixpkgs-65d26c4dc12f8f0113b6b128573f18492ac5b6f6.tar nixpkgs-65d26c4dc12f8f0113b6b128573f18492ac5b6f6.tar.gz nixpkgs-65d26c4dc12f8f0113b6b128573f18492ac5b6f6.tar.bz2 nixpkgs-65d26c4dc12f8f0113b6b128573f18492ac5b6f6.tar.lz nixpkgs-65d26c4dc12f8f0113b6b128573f18492ac5b6f6.tar.xz nixpkgs-65d26c4dc12f8f0113b6b128573f18492ac5b6f6.tar.zst nixpkgs-65d26c4dc12f8f0113b6b128573f18492ac5b6f6.zip | |
nixos: apply toposort to fileSystems to support bind and move mounts
And use new `config.system.build.fileSystems` property everywhere.
Diffstat (limited to 'nixos/modules/tasks/encrypted-devices.nix')
| -rw-r--r-- | nixos/modules/tasks/encrypted-devices.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/modules/tasks/encrypted-devices.nix b/nixos/modules/tasks/encrypted-devices.nix index 457b86e95ab..b1a7711ddcb 100644 --- a/nixos/modules/tasks/encrypted-devices.nix +++ b/nixos/modules/tasks/encrypted-devices.nix @@ -3,7 +3,7 @@ with lib; let - fileSystems = attrValues config.fileSystems ++ config.swapDevices; + fileSystems = config.system.build.fileSystems ++ config.swapDevices; encDevs = filter (dev: dev.encrypted.enable) fileSystems; keyedEncDevs = filter (dev: dev.encrypted.keyFile != null) encDevs; keylessEncDevs = filter (dev: dev.encrypted.keyFile == null) encDevs; |