From 0d58c4287c186a4da15184036564069b0b73175b Mon Sep 17 00:00:00 2001
From: Roland Clobus <rclobus@rclobus.nl>
Date: Sat, 15 Jul 2023 19:27:59 +0200
Subject: [PATCH] rebuild: update --disk-info

---
 test/rebuild.sh | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/test/rebuild.sh b/test/rebuild.sh
index 5fe399e90..213a6ea1c 100755
--- a/test/rebuild.sh
+++ b/test/rebuild.sh
@@ -120,6 +120,7 @@ parse_commandline_arguments() {
 			--disk-info)
 				shift
 				DISK_INFO="${1}"
+				shift
 				;;
 			--generate-source)
 				shift
@@ -441,12 +442,12 @@ This image was generated by $(basename ${BASH_SOURCE})
 Script commandline: ${REBUILD_COMMANDLINE}
 Script hash: ${REBUILD_SHA256SUM}
 EOF
+ISO8601_TIMESTAMP=$(date --utc -d@${SOURCE_DATE_EPOCH} +%Y-%m-%dT%H:%M:%SZ)
 if [ -z "${DISK_INFO}" ]
 then
-	ISO8601_TIMESTAMP=$(date --utc -d@${SOURCE_DATE_EPOCH} +%Y-%m-%dT%H:%M:%SZ)
-	DISK_INFO="Auto-generated Debian GNU/Linux Live ${DEBIAN_VERSION_NUMBER} ${CONFIGURATION} ${ISO8601_TIMESTAMP}"
+	DISK_INFO="Auto-generated Debian GNU/Linux Live ${DEBIAN_VERSION_NUMBER} ${CONFIGURATION}"
 fi
-echo -n "${DISK_INFO}" > config/includes.binary/.disk/info
+echo -n "${DISK_INFO} ${ISO8601_TIMESTAMP}" > config/includes.binary/.disk/info
 
 # Add additional hooks, that work around known issues regarding reproducibility
 cp -a ${LIVE_BUILD}/examples/hooks/reproducible/* config/hooks/normal