cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #119657 from syncom/syncom/deterministic-efiimg

Browse source
This commit is contained in:
Sandro 2021-06-26 21:50:20 +02:00 committed by GitHub
commit 5faf13ddad
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
nixos/modules/installer/cd-dvd/iso-image.nix
View file

@ -428,7 +428,8 @@ let
# Rewrite dates for everything in the FS # Rewrite dates for everything in the FS
find . -exec touch --date=2000-01-01 {} + find . -exec touch --date=2000-01-01 {} +
usage_size=$(du -sb --apparent-size . | tr -cd '[:digit:]') # Round up to the nearest multiple of 1MB, for more deterministic du output
usage_size=$(( $(du -s --block-size=1M --apparent-size . | tr -cd '[:digit:]') * 1024 * 1024 ))
# Make the image 110% as big as the files need to make up for FAT overhead # Make the image 110% as big as the files need to make up for FAT overhead
image_size=$(( ($usage_size * 110) / 100 )) image_size=$(( ($usage_size * 110) / 100 ))
# Make the image fit blocks of 1M # Make the image fit blocks of 1M
@ -438,7 +439,16 @@ let
echo "Image size: $image_size" echo "Image size: $image_size"
truncate --size=$image_size "$out" truncate --size=$image_size "$out"
faketime "2000-01-01 00:00:00" mkfs.vfat -i 12345678 -n EFIBOOT "$out" faketime "2000-01-01 00:00:00" mkfs.vfat -i 12345678 -n EFIBOOT "$out"
mcopy -psvm -i "$out" ./EFI ./boot ::
# Force a fixed order in mcopy for better determinism, and avoid file globbing
for d in $(find EFI boot -type d | sort); do
faketime "2000-01-01 00:00:00" mmd -i "$out" "::/$d"
done
for f in $(find EFI boot -type f | sort); do
mcopy -pvm -i "$out" "$f" "::/$f"
done
# Verify the FAT partition. # Verify the FAT partition.
fsck.vfat -vn "$out" fsck.vfat -vn "$out"
''; # */ ''; # */