From 6ccb1072e43b9f7c949680602fbeef0e6979f76d Mon Sep 17 00:00:00 2001 From: Maksim Malchuk Date: Mon, 24 Apr 2023 00:45:47 +0300 Subject: [PATCH] Extend the DIB_CHECKSUM variable usage Followup on I2dd1c60e3bfd9c823a7382b1390b1d40c52a5c97 Change-Id: I5e2d454fb84b76810f3c5ed26a0caeef8ea06675 Signed-off-by: Maksim Malchuk (cherry picked from commit e118104f9838875c56c51cc40ec106994baa72b3) --- dib/ironic-ramdisk-base/cleanup.d/99-ramdisk-create | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dib/ironic-ramdisk-base/cleanup.d/99-ramdisk-create b/dib/ironic-ramdisk-base/cleanup.d/99-ramdisk-create index e538839..0d65776 100755 --- a/dib/ironic-ramdisk-base/cleanup.d/99-ramdisk-create +++ b/dib/ironic-ramdisk-base/cleanup.d/99-ramdisk-create @@ -86,10 +86,11 @@ fi select_boot_kernel_initrd $TARGET_ROOT sudo cp $BOOTDIR/$KERNEL ${IMAGE_PATH}.kernel sudo chown $USER: ${IMAGE_PATH}.kernel -if [ "$DIB_CHECKSUM" == "1" ]; then +if [[ -n "$DIB_CHECKSUM" && "$DIB_CHECKSUM" != "0" ]]; then pushd $(dirname ${IMAGE_PATH}) - md5sum ${IMAGE_NAME}.initramfs ${IMAGE_NAME}.kernel > ${IMAGE_NAME}.md5 - sha256sum ${IMAGE_NAME}.initramfs ${IMAGE_NAME}.kernel > ${IMAGE_NAME}.sha256 + [[ "$DIB_CHECKSUM" == "1" ]] && DIB_CHECKSUM="md5,sha256" + [[ "$DIB_CHECKSUM" == *md5* ]] && md5sum ${IMAGE_NAME}.initramfs ${IMAGE_NAME}.kernel > ${IMAGE_NAME}.md5 + [[ "$DIB_CHECKSUM" == *sha256* ]] && sha256sum ${IMAGE_NAME}.initramfs ${IMAGE_NAME}.kernel > ${IMAGE_NAME}.sha256 popd fi # Output image sizes for debugging