From 4fa88fcecb4c57550837484cc6f371e77b53459a Mon Sep 17 00:00:00 2001 From: Victor Shlein Date: Tue, 19 Jun 2018 14:27:36 +0300 Subject: [PATCH] nixos/stage-1, nixos/f2fs: moved f2fs resizing tools include in f2fs module --- nixos/modules/system/boot/stage-1.nix | 7 ------- nixos/modules/tasks/filesystems/f2fs.nix | 5 +++++ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix index c7ea408f595..d66533fa067 100644 --- a/nixos/modules/system/boot/stage-1.nix +++ b/nixos/modules/system/boot/stage-1.nix @@ -128,13 +128,6 @@ let 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. ${optionalString (!config.boot.loader.supportsInitrdSecrets) (concatStringsSep "\n" (mapAttrsToList (dest: source: diff --git a/nixos/modules/tasks/filesystems/f2fs.nix b/nixos/modules/tasks/filesystems/f2fs.nix index d103ff1a57b..df803535aa4 100644 --- a/nixos/modules/tasks/filesystems/f2fs.nix +++ b/nixos/modules/tasks/filesystems/f2fs.nix @@ -14,6 +14,11 @@ 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) '' + # We need f2fs-tools' tools to resize filesystems + copy_bin_and_libs ${pkgs.f2fs-tools}/sbin/resize.f2fs + ''} + ''; }; }