Merge pull request #125121 from ztzg/x-16304-sd-image-slack

nixos/lib/make-ext4-fs: Fix: `resize2fs -M' can leave insufficient slack

authored by Jörg Thalheim and committed by GitHub 049dc4c4 f40605db

+3 -5
+3 -5
nixos/lib/make-ext4-fs.nix
··· 74 74 return 1 75 75 fi 76 76 77 - echo "Resizing to minimum allowed size" 78 - resize2fs -M $img 79 - 80 - # And a final fsck, because of the previous truncating. 81 - fsck.ext4 -n -f $img 77 + # We may want to shrink the file system and resize the image to 78 + # get rid of the unnecessary slack here--but see 79 + # https://github.com/NixOS/nixpkgs/issues/125121 for caveats. 82 80 83 81 if [ ${builtins.toString compressImage} ]; then 84 82 echo "Compressing image"