diff --git a/usr/bin/archboot-aarch64-iso.sh b/usr/bin/archboot-aarch64-iso.sh index c954a8697..37238d885 100755 --- a/usr/bin/archboot-aarch64-iso.sh +++ b/usr/bin/archboot-aarch64-iso.sh @@ -17,6 +17,7 @@ _reproducibility _prepare_uefi_image || exit 1 _reproducibility _grub_mkrescue || exit 1 +_reproducibility_iso || exit 1 _create_cksum || exit 1 _cleanup_iso || exit 1 echo "Finished ISO creation." diff --git a/usr/bin/archboot-x86_64-iso.sh b/usr/bin/archboot-x86_64-iso.sh index 38784f317..2a3567363 100755 --- a/usr/bin/archboot-x86_64-iso.sh +++ b/usr/bin/archboot-x86_64-iso.sh @@ -19,6 +19,7 @@ _reproducibility _prepare_uefi_image || exit 1 _reproducibility _grub_mkrescue || exit 1 +_reproducibility_iso || exit 1 _create_cksum || exit 1 _cleanup_iso || exit 1 echo "Finished ISO creation." diff --git a/usr/lib/archboot/iso_functions b/usr/lib/archboot/iso_functions index 0fc09f227..d7cd53712 100644 --- a/usr/lib/archboot/iso_functions +++ b/usr/lib/archboot/iso_functions @@ -155,6 +155,15 @@ _grub_mkrescue() { grub-mkrescue --set_all_file_dates 'Jan 1 00:00:00 UTC 1970' --modification-date=1970010100000000 --compress=xz --fonts="unicode" --locales="" --themes="" -o "${_IMAGENAME}.iso" "${_ISODIR}"/ "boot/grub/grub.cfg=${_GRUB_CONFIG}" &> "${_IMAGENAME}.log" } +_reproducibility_iso() { + echo "Create reproducable UUIDs on ${_IMAGENAME}.iso GPT ..." + sgdisk -u 1:1 "${_IMAGENAME}.iso" + sgdisk -u 2:2 "${_IMAGENAME}.iso" + sgdisk -u 3:3 "${_IMAGENAME}.iso" + sgdisk -u 4:4 "${_IMAGENAME}.iso" + sgdisk -U 1 "${_IMAGENAME}.iso" +} + _create_cksum() { ## create sha256sums.txt echo "Generating sha256sum ..."