summary refs log tree commit diff
diff options
context:
space:
mode:
authorVictor Shlein <kisik21@users.noreply.github.com>2018-06-19 14:31:06 +0300
committerVictor Shlein <kisik21@users.noreply.github.com>2018-06-19 14:31:06 +0300
commit62d21f251194ba93541239adc22afd0fb4f38f71 (patch)
tree14905a725b8954d342ab8f4d2c0f0b77684f1346
parent4fa88fcecb4c57550837484cc6f371e77b53459a (diff)
downloadnixpkgs-62d21f251194ba93541239adc22afd0fb4f38f71.tar
nixpkgs-62d21f251194ba93541239adc22afd0fb4f38f71.tar.gz
nixpkgs-62d21f251194ba93541239adc22afd0fb4f38f71.tar.bz2
nixpkgs-62d21f251194ba93541239adc22afd0fb4f38f71.tar.lz
nixpkgs-62d21f251194ba93541239adc22afd0fb4f38f71.tar.xz
nixpkgs-62d21f251194ba93541239adc22afd0fb4f38f71.tar.zst
nixpkgs-62d21f251194ba93541239adc22afd0fb4f38f71.zip
nixos/f2fs: fixed autoresize check
-rw-r--r--nixos/modules/tasks/filesystems/f2fs.nix3
1 files changed, 2 insertions, 1 deletions
diff --git a/nixos/modules/tasks/filesystems/f2fs.nix b/nixos/modules/tasks/filesystems/f2fs.nix
index df803535aa4..a305235979a 100644
--- a/nixos/modules/tasks/filesystems/f2fs.nix
+++ b/nixos/modules/tasks/filesystems/f2fs.nix
@@ -4,6 +4,7 @@ with lib;
 
 let
   inInitrd = any (fs: fs == "f2fs") config.boot.initrd.supportedFilesystems;
+  fileSystems = filter (x: x.fsType == "f2fs") config.system.build.fileSystems;
 in
 {
   config = mkIf (any (fs: fs == "f2fs") config.boot.supportedFilesystems) {
@@ -14,7 +15,7 @@ in
 
     boot.initrd.extraUtilsCommands = mkIf inInitrd ''
       copy_bin_and_libs ${pkgs.f2fs-tools}/sbin/fsck.f2fs
-      ${optionalString (any (fs: fs.autoResize && fs.fsType = "f2fs") fileSystems) ''
+      ${optionalString (any (fs: fs.autoResize) fileSystems) ''
         # We need f2fs-tools' tools to resize filesystems
         copy_bin_and_libs ${pkgs.f2fs-tools}/sbin/resize.f2fs
       ''}