Merge release-21.05 into staging-next-21.05

2021-07-10 12:02:59 +00:00 · 2021-07-10 12:02:59 +00:00 · 6500937b9b
parent e0f1b871c3 54db964a8b
commit 6500937b9b
1 changed files with 3 additions and 5 deletions
--- a/nixos/lib/make-ext4-fs.nix
+++ b/nixos/lib/make-ext4-fs.nix
@ -74,11 +74,9 @@ pkgs.stdenv.mkDerivation {
        return 1
      fi

-      echo "Resizing to minimum allowed size"
-      resize2fs -M $img
-
-      # And a final fsck, because of the previous truncating.
-      fsck.ext4 -n -f $img
+      # We may want to shrink the file system and resize the image to
+      # get rid of the unnecessary slack here--but see
+      # https://github.com/NixOS/nixpkgs/issues/125121 for caveats.

      if [ ${builtins.toString compressImage} ]; then
        echo "Compressing image"