From 079de14fd321ada7447a01b363c2b2c9908c67fe Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Sun, 21 Jun 2020 00:22:11 +0200 Subject: nixos/make-ext4-fs: increase fudge factor from 1.03 to 1.10 Turns out, on smaller images (~800MiB uncompressed sdcard image size), the current fudge factor is way too small to even get the system to the phase where it can resize itself. I first tried with 1.05, but it wasn't enough. --- nixos/lib/make-ext4-fs.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/lib/make-ext4-fs.nix b/nixos/lib/make-ext4-fs.nix index 627ac324cf5..516fe3fc673 100644 --- a/nixos/lib/make-ext4-fs.nix +++ b/nixos/lib/make-ext4-fs.nix @@ -43,7 +43,7 @@ pkgs.stdenv.mkDerivation { # Make a crude approximation of the size of the target image. # If the script starts failing, increase the fudge factors here. numInodes=$(find $storePaths ./files | wc -l) - numDataBlocks=$(du -s -c -B 4096 --apparent-size $storePaths ./files | tail -1 | awk '{ print int($1 * 1.03) }') + numDataBlocks=$(du -s -c -B 4096 --apparent-size $storePaths ./files | tail -1 | awk '{ print int($1 * 1.10) }') bytes=$((2 * 4096 * $numInodes + 4096 * $numDataBlocks)) echo "Creating an EXT4 image of $bytes bytes (numInodes=$numInodes, numDataBlocks=$numDataBlocks)" -- cgit 1.4.1