From 4fa88fcecb4c57550837484cc6f371e77b53459a Mon Sep 17 00:00:00 2001 From: Victor Shlein Date: Tue, 19 Jun 2018 14:27:36 +0300 Subject: nixos/stage-1, nixos/f2fs: moved f2fs resizing tools include in f2fs module --- nixos/modules/tasks/filesystems/f2fs.nix | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'nixos/modules/tasks/filesystems') diff --git a/nixos/modules/tasks/filesystems/f2fs.nix b/nixos/modules/tasks/filesystems/f2fs.nix index d103ff1a57b5..df803535aa49 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 + ''} + ''; }; } -- cgit 1.4.1 From 62d21f251194ba93541239adc22afd0fb4f38f71 Mon Sep 17 00:00:00 2001 From: Victor Shlein Date: Tue, 19 Jun 2018 14:31:06 +0300 Subject: nixos/f2fs: fixed autoresize check --- nixos/modules/tasks/filesystems/f2fs.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'nixos/modules/tasks/filesystems') diff --git a/nixos/modules/tasks/filesystems/f2fs.nix b/nixos/modules/tasks/filesystems/f2fs.nix index df803535aa49..a305235979a2 100644 --- a/nixos/modules/tasks/filesystems/f2fs.nix +++ b/nixos/modules/tasks/filesystems/f2fs.nix @@ -4,6 +4,7 @@ with lib; let inInitrd = any (fs: fs == "f2fs") config.boot.initrd.supportedFilesystems; + fileSystems = filter (x: x.fsType == "f2fs") config.system.build.fileSystems; in { config = mkIf (any (fs: fs == "f2fs") config.boot.supportedFilesystems) { @@ -14,7 +15,7 @@ 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) '' + ${optionalString (any (fs: fs.autoResize) fileSystems) '' # We need f2fs-tools' tools to resize filesystems copy_bin_and_libs ${pkgs.f2fs-tools}/sbin/resize.f2fs ''} -- cgit 1.4.1