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
base: e11288b9192e
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 17d192560851
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Dec 11, 2019

  1. installer/cd-dvd/iso-image: avoid leaking build timestamps 

    When 'grafting' '/nix/store/<hash>-loopback.cfg' from disk onto
'/boot/grub/loopback.cfg' on the iso, the parent 'grub' directory does not
exist yet. In this case it is automatically created and inherits its
attributes, including timestamp, from /nix/store.

This is correct/expected/intentional behavior of xorriso, but has the
undesired result of leaking the timestamps of /nix/store into the iso. For
this reason we put the loopback.cfg in a
'/nix/store/<hash>-loopback.cfg/grub/loopback.cfg' instead, so it will inherit
the attributes from the correctly-timestamped
'/nix/store/<hash>-loopback.cfg/grub' directory.

For the same reason we move '/EFI/boot/efi-background.png' down in the list
so it is grafted after its parent '/EFI/boot' directory is created with
the correct timestamp.

fixes #74944
    @raboof
    raboof committed Dec 11, 2019
    Copy the full SHA
    88ee3b0 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #75484 from raboof/74944-timestamps-leak-into-mini… 

    …mal-image

installer/cd-dvd/iso-image: avoid leaking build timestamps
    @domenkozar
    domenkozar committed Dec 11, 2019
    Copy the full SHA
    17d1925 View commit details
    Browse the repository at this point in the history