diff options
| author | Jan Malakhovski <oxij@oxij.org> | 2016-08-23 18:01:35 +0000 |
|---|---|---|
| committer | Jan Malakhovski <oxij@oxij.org> | 2016-08-23 18:14:06 +0000 |
| commit | b267785c43547dbe854c994a91b9f012c9b7812f (patch) | |
| tree | cb88b704712effa94316c631da785b2317e35c10 /nixos/modules/tasks/filesystems/zfs.nix | |
| parent | 8da59c406cea9ee3fbe37fce6211421281c47b78 (diff) | |
| download | nixpkgs-b267785c43547dbe854c994a91b9f012c9b7812f.tar nixpkgs-b267785c43547dbe854c994a91b9f012c9b7812f.tar.gz nixpkgs-b267785c43547dbe854c994a91b9f012c9b7812f.tar.bz2 nixpkgs-b267785c43547dbe854c994a91b9f012c9b7812f.tar.lz nixpkgs-b267785c43547dbe854c994a91b9f012c9b7812f.tar.xz nixpkgs-b267785c43547dbe854c994a91b9f012c9b7812f.tar.zst nixpkgs-b267785c43547dbe854c994a91b9f012c9b7812f.zip | |
nixos: generalize copy-paste from stage-1 and zfs to utils
Diffstat (limited to 'nixos/modules/tasks/filesystems/zfs.nix')
| -rw-r--r-- | nixos/modules/tasks/filesystems/zfs.nix | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/nixos/modules/tasks/filesystems/zfs.nix b/nixos/modules/tasks/filesystems/zfs.nix index 77059fa43ff..c5f41cc338c 100644 --- a/nixos/modules/tasks/filesystems/zfs.nix +++ b/nixos/modules/tasks/filesystems/zfs.nix @@ -38,11 +38,9 @@ let 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" ]; - allPools = unique ((map fsToPool zfsFilesystems) ++ cfgZfs.extraPools); - rootPools = unique (map fsToPool (filter isRoot zfsFilesystems)); + rootPools = unique (map fsToPool (filter fsNeededForBoot zfsFilesystems)); dataPools = unique (filter (pool: !(elem pool rootPools)) allPools); |