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 | |
parent | 8da59c406cea9ee3fbe37fce6211421281c47b78 (diff) |
nixos: generalize copy-paste from stage-1 and zfs to utils
Diffstat (limited to 'nixos/modules')
-rw-r--r-- | nixos/modules/system/boot/stage-1.nix | 4 | ||||
-rw-r--r-- | nixos/modules/tasks/filesystems/zfs.nix | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix index 982f4e4a85c9..a5c05f3dbbaf 100644 --- a/nixos/modules/system/boot/stage-1.nix +++ b/nixos/modules/system/boot/stage-1.nix @@ -26,9 +26,7 @@ let # The initrd only has to mount `/` or any FS marked as necessary for # booting (such as the FS containing `/nix/store`, or an FS needed for # mounting `/`, like `/` on a loopback). - fileSystems = filter - (fs: fs.neededForBoot || elem fs.mountPoint [ "/" "/nix" "/nix/store" "/var" "/var/log" "/var/lib" "/etc" ]) - config.system.build.fileSystems; + fileSystems = filter utils.fsNeededForBoot config.system.build.fileSystems; # Some additional utilities needed in stage 1, like mount, lvm, fsck diff --git a/nixos/modules/tasks/filesystems/zfs.nix b/nixos/modules/tasks/filesystems/zfs.nix index 77059fa43ffa..c5f41cc338cf 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); |