From 0abf65eaf7a86fca3f55a70f2721f7aed700b161 Mon Sep 17 00:00:00 2001
From: Ian Wienand <iwienand@redhat.com>
Date: Tue, 12 Jul 2022 12:40:04 +1000
Subject: [PATCH] opensuse: better report checksum errors

Report the checksums and size to make it clearer what is failing.

Change-Id: I7c662e13cdbc19b3935f66ed422f15c2de53e525
---
 .../opensuse/root.d/10-opensuse-cloud-image       | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/diskimage_builder/elements/opensuse/root.d/10-opensuse-cloud-image b/diskimage_builder/elements/opensuse/root.d/10-opensuse-cloud-image
index 0c567bb2..a4750783 100755
--- a/diskimage_builder/elements/opensuse/root.d/10-opensuse-cloud-image
+++ b/diskimage_builder/elements/opensuse/root.d/10-opensuse-cloud-image
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-if [ ${DIB_DEBUG_TRACE:-0} -gt 0 ]; then
+if [ ${DIB_DEBUG_TRACE:-0} -gt 1 ]; then
     set -x
 fi
 set -eu
@@ -41,12 +41,21 @@ if [ -n "$DIB_OFFLINE" -a -f "$CACHED_FILE" ] ; then
     # between image tarball and host OS)
     sudo tar -C $TARGET_ROOT --numeric-owner -xf $CACHED_FILE
 else
-    echo "Fetching Base Image"
+    echo "Fetching Base Image ${BASE_IMAGE_FILE}"
     $TMP_HOOKS_PATH/bin/cache-url $DIB_CLOUD_IMAGES/$SHA256SUMS_FILE $CACHED_SHA256SUMS_FILE
     $TMP_HOOKS_PATH/bin/extract-image $BASE_IMAGE_FILE $BASE_IMAGE_FILE.tgz $DIB_CLOUD_IMAGES/$BASE_IMAGE_FILE $CACHED_FILE
     pushd $DIB_IMAGE_CACHE
+
     # Calculate sha256sum of downloaded image and check against content from sha256 file
     SHA256SUM=$(sha256sum ${BASE_IMAGE_FILE} | cut -d " " -f1)
-    grep -q $SHA256SUM SHA256SUMS.$BASE_IMAGE_FILE
+    SIZE=$(stat -c%s ${BASE_IMAGE_FILE})
+    echo "Base image has sha256sum:${SHA256SUM} size:${SIZE}"
+    if grep -q $SHA256SUM SHA256SUMS.$BASE_IMAGE_FILE; then
+        echo "Image downloaded successfully"
+    else
+        echo "*** Checksum mismatch"
+        cat SHA256SUMS.$BASE_IMAGE_FILE
+        exit 1
+    fi
     popd
 fi