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/filesystems | |
| parent | 2c8ca0d1bd1df838b3e3b2d2e17c6855b3b520c1 (diff) | |
| download | nixlib-65d26c4dc12f8f0113b6b128573f18492ac5b6f6.tar nixlib-65d26c4dc12f8f0113b6b128573f18492ac5b6f6.tar.gz nixlib-65d26c4dc12f8f0113b6b128573f18492ac5b6f6.tar.bz2 nixlib-65d26c4dc12f8f0113b6b128573f18492ac5b6f6.tar.lz nixlib-65d26c4dc12f8f0113b6b128573f18492ac5b6f6.tar.xz nixlib-65d26c4dc12f8f0113b6b128573f18492ac5b6f6.tar.zst nixlib-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/filesystems')
| -rw-r--r-- | nixos/modules/tasks/filesystems/zfs.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nixos/modules/tasks/filesystems/zfs.nix b/nixos/modules/tasks/filesystems/zfs.nix index 4ff3ffc74b16..77059fa43ffa 100644 --- a/nixos/modules/tasks/filesystems/zfs.nix +++ b/nixos/modules/tasks/filesystems/zfs.nix @@ -36,7 +36,7 @@ let fsToPool = fs: datasetToPool fs.device; - zfsFilesystems = filter (x: x.fsType == "zfs") (attrValues config.fileSystems); + zfsFilesystems = filter (x: x.fsType == "zfs") config.system.build.fileSystems; isRoot = fs: fs.neededForBoot || elem fs.mountPoint [ "/" "/nix" "/nix/store" "/var" "/var/log" "/var/lib" "/etc" ]; @@ -277,7 +277,7 @@ in systemd.services = let getPoolFilesystems = pool: - filter (x: x.fsType == "zfs" && (fsToPool x) == pool) (attrValues config.fileSystems); + filter (x: x.fsType == "zfs" && (fsToPool x) == pool) config.system.build.fileSystems; getPoolMounts = pool: let |