From 745b2be876b50b5033c7d2514facb5b71799c9ae Mon Sep 17 00:00:00 2001
From: Roland Clobus <rclobus@rclobus.nl>
Date: Sun, 21 Mar 2021 12:32:54 +0100
Subject: Fixed handling of checksums in combination with the d-i installer.

1) lb config rejected multiple checksum types
2) When using the installer, cdrom-checker requires a md5 checksum file,
   use 'Check the integrity of the installation media' in the installer
3) The comments in the first lines of the checksum files caused
   cdrom-checker to fail the integrity of the image
---
 scripts/build/binary_checksums | 19 +++++++------------
 scripts/build/source_checksums | 19 +++++++------------
 2 files changed, 14 insertions(+), 24 deletions(-)

(limited to 'scripts')

diff --git a/scripts/build/binary_checksums b/scripts/build/binary_checksums
index 3d79aab91..75c6fe770 100755
--- a/scripts/build/binary_checksums
+++ b/scripts/build/binary_checksums
@@ -55,20 +55,15 @@ do
 		\! -path './boot/grub/stage2_eltorito' \
 		\! -path './*SUMS' \
 		\! -path './*sum.txt' \
-	-print0 | sort -z | xargs -0 ${CHECKSUM}sum > ../${CHECKSUMS}
+		\! -path './*sum.README' \
+	-print0 | sort -z | xargs -0 ${CHECKSUM}sum > ${CHECKSUMS}
 
-cat > ${CHECKSUMS} << EOF
-## This file contains the list of ${CHECKSUM} checksums of all files on this
-## medium.
-##
-## You can verify them automatically with the 'verify-checksums' boot parameter,
-## or, manually with: '${CHECKSUM}sum -c ${CHECKSUMS}'.
-##
-##
-EOF
+cat > ${CHECKSUM}sum.README << EOF
+The file ${CHECKSUMS} contains the ${CHECKSUM} checksums of all files on this medium.
 
-	cat ../${CHECKSUMS} >> ${CHECKSUMS}
-	rm -f ../${CHECKSUMS}
+You can verify them automatically with the 'verify-checksums' boot parameter,
+or, manually with: '${CHECKSUM}sum -c ${CHECKSUMS}'.
+EOF
 
 	cd "${OLDPWD}"
 done
diff --git a/scripts/build/source_checksums b/scripts/build/source_checksums
index fe289e396..db23aa867 100755
--- a/scripts/build/source_checksums
+++ b/scripts/build/source_checksums
@@ -59,20 +59,15 @@ do
 		find . -type f \
 			\! -path './*SUMS' \
 			\! -path './*sum.txt' \
-		-print0 | sort -z | xargs -0 ${CHECKSUM}sum > ../${CHECKSUMS}
+			\! -path './*sum.README' \
+		-print0 | sort -z | xargs -0 ${CHECKSUM}sum > ${CHECKSUMS}
 
-cat > ${CHECKSUMS} << EOF
-## This file contains the list of ${CHECKSUM} checksums of all files on this
-## medium.
-##
-## You can verify them automatically with the 'verify-checksums' boot parameter,
-## or, manually with: '${CHECKSUM}sum -c ${CHECKSUMS}'.
-##
-##
-EOF
+cat > ${CHECKSUM}sum.README << EOF
+The file ${CHECKSUMS} contains the ${CHECKSUM} checksums of all files on this medium.
 
-		cat ../${CHECKSUMS} >> ${CHECKSUMS}
-		rm -f ../${CHECKSUMS}
+You can verify them automatically with the 'verify-checksums' boot parameter,
+or, manually with: '${CHECKSUM}sum -c ${CHECKSUMS}'.
+EOF
 
 		cd "${OLDPWD}"
 	done
-- 
cgit v1.2.3