diff options
author | Arnout Engelen <arnout@bzzt.net> | 2019-11-25 18:33:33 +0100 |
---|---|---|
committer | Arnout Engelen <arnout@bzzt.net> | 2020-07-20 11:16:59 +0200 |
commit | be006eab1f3df27c405a02897d735768f180260f (patch) | |
tree | 14efed88a747c091d8793738052fef35c60caf44 /nixos/lib/make-iso9660-image.nix | |
parent | dc80d7bc4a244120b3d766746c41c0d9c5f81dfa (diff) |
make-iso9660-image: produce stable GPT disk GUID
By generating a version-5 GUID based on $out (which contains the derivation hash) and preventing isohybrid from overwriting the GPT table (which already is populated correctly by xorriso). Tested by: * booting from USB disk on a UEFI system * booting from USB disk on a non-UEFI system * booting from CD on a UEFI system * booting from CD on a non-UEFI system * booting from CD on an OSX system Also tested that "nix-build ./nixos/release-combined.nix -A nixos.iso_minimal.x86_64-linux -I nixpkgs=~/nixpkgs-r13y --check" now succeeds. Fixes #74047
Diffstat (limited to 'nixos/lib/make-iso9660-image.nix')
-rw-r--r-- | nixos/lib/make-iso9660-image.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nixos/lib/make-iso9660-image.nix b/nixos/lib/make-iso9660-image.nix index 12a6cf6499663..6a0e0e7c635a4 100644 --- a/nixos/lib/make-iso9660-image.nix +++ b/nixos/lib/make-iso9660-image.nix @@ -1,4 +1,4 @@ -{ stdenv, closureInfo, xorriso, syslinux +{ stdenv, closureInfo, xorriso, syslinux, libossp_uuid , # The file name of the resulting ISO image. isoName ? "cd.iso" @@ -48,7 +48,7 @@ assert usbBootable -> isohybridMbrImage != ""; stdenv.mkDerivation { name = isoName; builder = ./make-iso9660-image.sh; - buildInputs = [ xorriso syslinux zstd ]; + buildInputs = [ xorriso syslinux zstd libossp_uuid ]; inherit isoName bootable bootImage compressImage volumeID efiBootImage efiBootable isohybridMbrImage usbBootable; |