diff options
| author | Robert Hensing <roberth@users.noreply.github.com> | 2021-06-26 08:31:12 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-26 08:31:12 +0200 |
| commit | c1a75084ea38df6f4b5116a55fd0a5cd468e2125 (patch) | |
| tree | 23787f091a6633e363a8f298606a77a7f475af0d /nixos/lib | |
| parent | d8d65c00a9831c90a4bfa9c156b794c104cd4440 (diff) | |
| parent | c3f28aed94ba37279d02b1de5eb15b8000754c5d (diff) | |
| download | nixpkgs-c1a75084ea38df6f4b5116a55fd0a5cd468e2125.tar nixpkgs-c1a75084ea38df6f4b5116a55fd0a5cd468e2125.tar.gz nixpkgs-c1a75084ea38df6f4b5116a55fd0a5cd468e2125.tar.bz2 nixpkgs-c1a75084ea38df6f4b5116a55fd0a5cd468e2125.tar.lz nixpkgs-c1a75084ea38df6f4b5116a55fd0a5cd468e2125.tar.xz nixpkgs-c1a75084ea38df6f4b5116a55fd0a5cd468e2125.tar.zst nixpkgs-c1a75084ea38df6f4b5116a55fd0a5cd468e2125.zip | |
Merge pull request #127744 from cransom/disk-image-faster
make-disk-image: Reduce forking
Diffstat (limited to 'nixos/lib')
| -rw-r--r-- | nixos/lib/make-disk-image.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/lib/make-disk-image.nix b/nixos/lib/make-disk-image.nix index 7d40d3b5548..55643facea0 100644 --- a/nixos/lib/make-disk-image.nix +++ b/nixos/lib/make-disk-image.nix @@ -278,7 +278,7 @@ let format' = format; in let additionalSpace=$(( $(numfmt --from=iec '${additionalSpace}') + reservedSpace )) # Compute required space in filesystem blocks - diskUsage=$(find . ! -type d -exec 'du' '--apparent-size' '--block-size' "${blockSize}" '{}' ';' | cut -f1 | sum_lines) + diskUsage=$(find . ! -type d -print0 | du --files0-from=- --apparent-size --block-size "${blockSize}" | cut -f1 | sum_lines) # Each inode takes space! numInodes=$(find . | wc -l) # Convert to bytes, inodes take two blocks each! |