diff options
| author | Victor Shlein <kisik21@users.noreply.github.com> | 2018-06-19 14:23:39 +0300 |
|---|---|---|
| committer | Victor Shlein <kisik21@users.noreply.github.com> | 2018-06-19 14:23:39 +0300 |
| commit | 34234dcb511066dd1e4fe75d80ee89519a8c8001 (patch) | |
| tree | afe14c39c0699a7faf4b92565e1867cf73390fac /nixos | |
| parent | 577483738c602581b3688a136dd9dea988e4ecd7 (diff) | |
| download | nixlib-34234dcb511066dd1e4fe75d80ee89519a8c8001.tar nixlib-34234dcb511066dd1e4fe75d80ee89519a8c8001.tar.gz nixlib-34234dcb511066dd1e4fe75d80ee89519a8c8001.tar.bz2 nixlib-34234dcb511066dd1e4fe75d80ee89519a8c8001.tar.lz nixlib-34234dcb511066dd1e4fe75d80ee89519a8c8001.tar.xz nixlib-34234dcb511066dd1e4fe75d80ee89519a8c8001.tar.zst nixlib-34234dcb511066dd1e4fe75d80ee89519a8c8001.zip | |
nixos/stage-1: new separate conditionals for ext4 and f2fs resizing tools
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/system/boot/stage-1.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix index b1fddf8dd7f8..c7ea408f595c 100644 --- a/nixos/modules/system/boot/stage-1.nix +++ b/nixos/modules/system/boot/stage-1.nix @@ -122,14 +122,14 @@ let copy_bin_and_libs ${pkgs.kmod}/bin/kmod ln -sf kmod $out/bin/modprobe - # Copy resize2fs if needed. - ${optionalString (any (fs: fs.autoResize) fileSystems) '' + # Copy resize2fs if any ext* filesystems are to be resized + ${optionalString (any (fs: fs.autoResize && (lib.hasPrefix "ext" fs.fsType)) fileSystems) '' # We need mke2fs in the initrd. copy_bin_and_libs ${pkgs.e2fsprogs}/sbin/resize2fs ''} # Copy f2fs-tools' fsck and resize if needed - ${optionalString (any (fs: fs.autoResize) (filter (x: x.fsType == "f2fs") fileSystems)) '' + ${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 |