public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nixos/f2fs: fixed autoresize check

Browse Source
This commit is contained in:
Victor Shlein 2018-06-19 14:31:06 +03:00
parent 4fa88fcecb
commit 62d21f2511
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nixos/modules/tasks/filesystems/f2fs.nix
View File

@ -4,6 +4,7 @@ with lib;
let let
inInitrd = any (fs: fs == "f2fs") config.boot.initrd.supportedFilesystems; inInitrd = any (fs: fs == "f2fs") config.boot.initrd.supportedFilesystems;
fileSystems = filter (x: x.fsType == "f2fs") config.system.build.fileSystems;
in in
{ {
config = mkIf (any (fs: fs == "f2fs") config.boot.supportedFilesystems) { config = mkIf (any (fs: fs == "f2fs") config.boot.supportedFilesystems) {
@ -14,7 +15,7 @@ in
boot.initrd.extraUtilsCommands = mkIf inInitrd '' boot.initrd.extraUtilsCommands = mkIf inInitrd ''
copy_bin_and_libs ${pkgs.f2fs-tools}/sbin/fsck.f2fs 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 # We need f2fs-tools' tools to resize filesystems
copy_bin_and_libs ${pkgs.f2fs-tools}/sbin/resize.f2fs copy_bin_and_libs ${pkgs.f2fs-tools}/sbin/resize.f2fs
''} ''}