diff options
| author | Thomas Watson <twatson52@icloud.com> | 2022-01-03 16:20:00 -0600 |
|---|---|---|
| committer | Thomas Watson <twatson52@icloud.com> | 2022-01-05 12:05:15 -0600 |
| commit | 450ce00ec4c2f48fffb552f03898e5a3d64164f4 (patch) | |
| tree | cad2036721b459f507dba70bb33aaba2548a5315 | |
| parent | 2ca1e9e4aa4849e3310687fe6a2131d80258e777 (diff) | |
| download | nixpkgs-450ce00ec4c2f48fffb552f03898e5a3d64164f4.tar nixpkgs-450ce00ec4c2f48fffb552f03898e5a3d64164f4.tar.gz nixpkgs-450ce00ec4c2f48fffb552f03898e5a3d64164f4.tar.bz2 nixpkgs-450ce00ec4c2f48fffb552f03898e5a3d64164f4.tar.lz nixpkgs-450ce00ec4c2f48fffb552f03898e5a3d64164f4.tar.xz nixpkgs-450ce00ec4c2f48fffb552f03898e5a3d64164f4.tar.zst nixpkgs-450ce00ec4c2f48fffb552f03898e5a3d64164f4.zip | |
installer/cd-dvd/iso-image: avoid leaking build timestamps on non-x86
| -rw-r--r-- | nixos/lib/make-iso9660-image.sh | 1 | ||||
| -rw-r--r-- | nixos/modules/installer/cd-dvd/iso-image.nix | 13 |
2 files changed, 7 insertions, 7 deletions
diff --git a/nixos/lib/make-iso9660-image.sh b/nixos/lib/make-iso9660-image.sh index 4740b05f955..9273b8d3db8 100644 --- a/nixos/lib/make-iso9660-image.sh +++ b/nixos/lib/make-iso9660-image.sh @@ -105,6 +105,7 @@ mkdir -p $out/iso # version-5 UUID's work) xorriso="xorriso -boot_image any gpt_disk_guid=$(uuid -v 5 daed2280-b91e-42c0-aed6-82c825ca41f3 $out | tr -d -) + -volume_date all_file_dates =$SOURCE_DATE_EPOCH -as mkisofs -iso-level 3 -volid ${volumeID} diff --git a/nixos/modules/installer/cd-dvd/iso-image.nix b/nixos/modules/installer/cd-dvd/iso-image.nix index 30610b4f426..3ff1b3d670e 100644 --- a/nixos/modules/installer/cd-dvd/iso-image.nix +++ b/nixos/modules/installer/cd-dvd/iso-image.nix @@ -734,13 +734,13 @@ in { source = config.system.build.squashfsStore; target = "/nix-store.squashfs"; } - { source = config.isoImage.splashImage; - target = "/isolinux/background.png"; - } { source = pkgs.writeText "version" config.system.nixos.label; target = "/version.txt"; } ] ++ optionals canx86BiosBoot [ + { source = config.isoImage.splashImage; + target = "/isolinux/background.png"; + } { source = pkgs.substituteAll { name = "isolinux.cfg"; src = pkgs.writeText "isolinux.cfg-in" isolinuxCfg; @@ -761,6 +761,9 @@ in { source = (pkgs.writeTextDir "grub/loopback.cfg" "source /EFI/boot/grub.cfg") + "/grub"; target = "/boot/grub"; } + { source = config.isoImage.efiSplashImage; + target = "/EFI/boot/efi-background.png"; + } ] ++ optionals (config.boot.loader.grub.memtest86.enable && canx86BiosBoot) [ { source = "${pkgs.memtest86plus}/memtest.bin"; target = "/boot/memtest.bin"; @@ -769,10 +772,6 @@ in { source = config.isoImage.grubTheme; target = "/EFI/boot/grub-theme"; } - ] ++ [ - { source = config.isoImage.efiSplashImage; - target = "/EFI/boot/efi-background.png"; - } ]; boot.loader.timeout = 10; |