From 577483738c602581b3688a136dd9dea988e4ecd7 Mon Sep 17 00:00:00 2001 From: Victor Shlein Date: Tue, 19 Jun 2018 13:53:34 +0300 Subject: [PATCH] nixos/stage-1: implemented separate check for f2fs filesystems in need of resizing --- nixos/modules/system/boot/stage-1.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix index 21f2fdb41582..b1fddf8dd7f8 100644 --- a/nixos/modules/system/boot/stage-1.nix +++ b/nixos/modules/system/boot/stage-1.nix @@ -126,8 +126,11 @@ let ${optionalString (any (fs: fs.autoResize) fileSystems) '' # We need mke2fs in the initrd. copy_bin_and_libs ${pkgs.e2fsprogs}/sbin/resize2fs - # Copy also f2fs-tools' fsck and resize - # TODO: separate these in case no f2fs fs are present + ''} + + # Copy f2fs-tools' fsck and resize if needed + ${optionalString (any (fs: fs.autoResize) (filter (x: x.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 ''}