gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nixos: apply toposort to fileSystems to support bind and move mounts

Browse Source 
And use new `config.system.build.fileSystems` property everywhere.
This commit is contained in:
Jan Malakhovski
2015-11-25 19:09:09 +00:00
parent 2c8ca0d1bd
commit 65d26c4dc1
6 changed files with 43 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/tasks/encrypted-devices.nix
View File

@@ -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;