Merge pull request #42183 from kisik21/master

nixos/stage-1, nixos/f2fs: added F2FS resizing
This commit is contained in:
Jörg Thalheim
2019-01-17 07:42:32 +00:00
committed by GitHub
3 changed files with 12 additions and 2 deletions
@@ -340,6 +340,10 @@ mountFS() {
echo "resizing $device..."
e2fsck -fp "$device"
resize2fs "$device"
elif [ "$fsType" = f2fs ]; then
echo "resizing $device..."
fsck.f2fs -fp "$device"
resize.f2fs "$device"
fi
;;
esac
+2 -2
View File
@@ -127,8 +127,8 @@ 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
''}