Merge pull request #11484 from oxij/nixos-toposort-filesystems

lib: add toposort, nixos: use toposort for fileSystems to properly support bind and move mounts
2016-08-27 14:34:55 +04:00
parent 44289f81e9 b267785c43
commit 3f70fcd4c1
7 changed files with 133 additions and 35 deletions
@@ -12,7 +12,7 @@ let
    (fs: (fs.neededForBoot
          || elem fs.mountPoint [ "/" "/nix" "/nix/store" "/var" "/var/log" "/var/lib" "/etc" ])
          && fs.fsType == "zfs")
-    (attrValues config.fileSystems) != [];
+    config.system.build.fileSystems != [];

  # Ascertain whether NixOS container support is required
  containerSupportRequired =