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

nixos/stage-1, nixos/f2fs: moved f2fs resizing tools include in f2fs module

Browse Source
This commit is contained in:
Victor Shlein 2018-06-19 14:27:36 +03:00
parent 34234dcb51
commit 4fa88fcecb
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
nixos/modules/system/boot/stage-1.nix
View File

@ -128,13 +128,6 @@ let
copy_bin_and_libs ${pkgs.e2fsprogs}/sbin/resize2fs copy_bin_and_libs ${pkgs.e2fsprogs}/sbin/resize2fs
''} ''}
# Copy f2fs-tools' fsck and resize if needed
${optionalString (any (fs: fs.autoResize && fs.fsType = "f2fs") fileSystems) ''
# We need f2fs-tools' tools to resize filesystems
copy_bin_and_libs ${pkgs.f2fs-tools}/sbin/fsck.f2fs
copy_bin_and_libs ${pkgs.f2fs-tools}/sbin/resize.f2fs
''}
# Copy secrets if needed. # Copy secrets if needed.
${optionalString (!config.boot.loader.supportsInitrdSecrets) ${optionalString (!config.boot.loader.supportsInitrdSecrets)
(concatStringsSep "\n" (mapAttrsToList (dest: source: (concatStringsSep "\n" (mapAttrsToList (dest: source:

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

@ -14,6 +14,11 @@ 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) ''
# We need f2fs-tools' tools to resize filesystems
copy_bin_and_libs ${pkgs.f2fs-tools}/sbin/resize.f2fs
''}
''; '';
}; };
} }