diff options
| author | Katharina Fey <kookie@spacekookie.de> | 2020-08-07 12:29:39 +0200 |
|---|---|---|
| committer | Katharina Fey <kookie@spacekookie.de> | 2020-08-07 12:29:39 +0200 |
| commit | 5581b5521e14317c3507a6e8451a3f14996e5c4d (patch) | |
| tree | 7aadee5a9ef5d6e2acc8929818c6eb2d2099e2ae /nixpkgs/nixos/lib/utils.nix | |
| parent | de94c6c62e2f86b3667386a42690d6bb376a2f58 (diff) | |
| parent | 8e2b14aceb1d40c7e8b84c03a7c78955359872bb (diff) | |
Merge commit '8e2b14aceb1d40c7e8b84c03a7c78955359872bb'
Diffstat (limited to 'nixpkgs/nixos/lib/utils.nix')
| -rw-r--r-- | nixpkgs/nixos/lib/utils.nix | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/nixpkgs/nixos/lib/utils.nix b/nixpkgs/nixos/lib/utils.nix index 21f4c7c6988..543c8a8882e 100644 --- a/nixpkgs/nixos/lib/utils.nix +++ b/nixpkgs/nixos/lib/utils.nix @@ -2,9 +2,11 @@ pkgs: with pkgs.lib; rec { - # Check whenever fileSystem is needed for boot - fsNeededForBoot = fs: fs.neededForBoot - || elem fs.mountPoint [ "/" "/nix" "/nix/store" "/var" "/var/log" "/var/lib" "/etc" ]; + # Check whenever fileSystem is needed for boot. NOTE: Make sure + # pathsNeededForBoot is closed under the parent relationship, i.e. if /a/b/c + # is in the list, put /a and /a/b in as well. + pathsNeededForBoot = [ "/" "/nix" "/nix/store" "/var" "/var/log" "/var/lib" "/etc" ]; + fsNeededForBoot = fs: fs.neededForBoot || elem fs.mountPoint pathsNeededForBoot; # Check whenever `b` depends on `a` as a fileSystem fsBefore = a: b: a.mountPoint == b.device |