Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: e0b4356c0dc7
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: bb32e322a5aa
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Mar 13, 2019

  1. iso-image: make reproducible by not relying on mcopy's readdir

    @Ekleog
    Ekleog committed Mar 13, 2019
    Copy the full SHA
    f7fb88c View commit details

Commits on Mar 29, 2019

  1. Merge pull request #57559 from Ekleog/iso-image-reproducibilization 

    iso-image: make reproducible by not relying on mcopy's readdir
    @grahamc
    grahamc authored Mar 29, 2019
    Copy the full SHA
    bb32e32 View commit details
Showing with 13 additions and 2 deletions.
  1. +13 −2 nixos/modules/installer/cd-dvd/iso-image.nix
15 changes: 13 additions & 2 deletions nixos/modules/installer/cd-dvd/iso-image.nix
View file
Original file line number Diff line number Diff line change
@@ -338,15 +338,18 @@ let

efiImg = pkgs.runCommand "efi-image_eltorito" { buildInputs = [ pkgs.mtools pkgs.libfaketime ]; }
# 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
cp -rp "${efiDir}"/EFI .
mkdir ./boot
cp -p "${config.boot.kernelPackages.kernel}/${config.system.boot.loader.kernelFile}" \
"${config.system.build.initialRamdisk}/${config.system.boot.loader.initrdFile}" ./boot/
touch --date=@0 ./EFI ./boot
# Prepare the image file
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
image_size=$(( ($usage_size * 110) / 100 ))
@@ -356,8 +359,16 @@ let
echo "Usage size: $usage_size"
echo "Image size: $image_size"
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"
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.
${pkgs.dosfstools}/sbin/fsck.vfat -vn "$out"
''; # */