public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Merge pull request #57559 from Ekleog/iso-image-reproducibilization"

Browse Source 
This reverts commit bb32e322a5aa81203eb3494081539eea8a70adcb, reversing
changes made to e0b4356c0dc7d35d9ee17d23b53d8c2020d4e618.
This commit is contained in:
Léo Gaspard 2019-04-01 18:17:42 +02:00
parent 3ed222ebd4
commit e3b87b04b7
1 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
nixos/modules/installer/cd-dvd/iso-image.nix
View File

@ -338,10 +338,8 @@ let
efiImg = pkgs.runCommand "efi-image_eltorito" { buildInputs = [ pkgs.mtools pkgs.libfaketime ]; } efiImg = pkgs.runCommand "efi-image_eltorito" { buildInputs = [ pkgs.mtools pkgs.libfaketime ]; }
# Be careful about determinism: du --apparent-size, # Be careful about determinism: du --apparent-size,
# dates (cp -p, touch, mcopy -m, faketime for label), IDs (mkfs.vfat -i), # dates (cp -p, touch, mcopy -m, faketime for label), IDs (mkfs.vfat -i)
# mcopy's write order (-s uses `readdir` order)
'' ''
# Prepare the ./EFI and ./boot directories
mkdir ./contents && cd ./contents mkdir ./contents && cd ./contents
cp -rp "${efiDir}"/EFI . cp -rp "${efiDir}"/EFI .
mkdir ./boot mkdir ./boot
@ -349,7 +347,6 @@ let
"${config.system.build.initialRamdisk}/${config.system.boot.loader.initrdFile}" ./boot/ "${config.system.build.initialRamdisk}/${config.system.boot.loader.initrdFile}" ./boot/
touch --date=@0 ./EFI ./boot touch --date=@0 ./EFI ./boot
# Prepare the image file
usage_size=$(du -sb --apparent-size . | tr -cd '[:digit:]') usage_size=$(du -sb --apparent-size . | tr -cd '[:digit:]')
# 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 ))
@ -359,16 +356,8 @@ let
echo "Usage size: $usage_size" echo "Usage size: $usage_size"
echo "Image size: $image_size" echo "Image size: $image_size"
truncate --size=$image_size "$out" truncate --size=$image_size "$out"
# Make the filesystem
${pkgs.libfaketime}/bin/faketime "2000-01-01 00:00:00" ${pkgs.dosfstools}/sbin/mkfs.vfat -i 12345678 -n EFIBOOT "$out" ${pkgs.libfaketime}/bin/faketime "2000-01-01 00:00:00" ${pkgs.dosfstools}/sbin/mkfs.vfat -i 12345678 -n EFIBOOT "$out"
mcopy -psvm -i "$out" ./EFI ./boot ::
# Copy the files
# Note: we can't use mcopy's recursive copying as it uses `readdir` order.
# So just copy file-after-file
find ./EFI ./boot -type f -print0 | sort -z | \
xargs -0I '{}' mcopy -pvm -i "$out" '{}' ::
# Verify the FAT partition. # Verify the FAT partition.
${pkgs.dosfstools}/sbin/fsck.vfat -vn "$out" ${pkgs.dosfstools}/sbin/fsck.vfat -vn "$out"
''; # */ ''; # */