From 579c79ce15a1c9655eaac3753f3c592833fe5a1e Mon Sep 17 00:00:00 2001
From: kdoren <kevind@avaya.com>
Date: Wed, 23 Sep 2020 11:54:37 -0700
Subject: [PATCH] workaround build failure on AWS M6g instances (#449)

---
 export-image/prerun.sh | 29 ++++++++++++++++++++++++++---
 1 file changed, 26 insertions(+), 3 deletions(-)

diff --git a/export-image/prerun.sh b/export-image/prerun.sh
index 347db90246..ec124b9630 100755
--- a/export-image/prerun.sh
+++ b/export-image/prerun.sh
@@ -55,9 +55,32 @@ EOF
 	BOOTLOADER_OFFSET=$(echo "$PARTED_OUT" | grep -e '^3:' | cut -d':' -f 2 | tr -d B)
 	BOOTLOADER_LENGTH=$(echo "$PARTED_OUT" | grep -e '^3:' | cut -d':' -f 4 | tr -d B)
 
-	BOOT_DEV=$(losetup --show -f -o "${BOOT_OFFSET}" --sizelimit "${BOOT_LENGTH}" "${IMG_FILE}")
-	ROOT_DEV=$(losetup --show -f -o "${ROOT_OFFSET}" --sizelimit "${ROOT_LENGTH}" "${IMG_FILE}")
-	BOOTLOADER_DEV=$(losetup --show -f -o "${BOOTLOADER_OFFSET}" --sizelimit "${BOOTLOADER_LENGTH}" "${IMG_FILE}")
+	echo "Mounting BOOT_DEV..."
+	cnt=0
+	until BOOT_DEV=$(losetup --show -f -o "${BOOT_OFFSET}" --sizelimit "${BOOT_LENGTH}" "${IMG_FILE}"); do
+		if [ $cnt -lt 5 ]; then
+			cnt=$((cnt + 1))
+			echo "Error in losetup for BOOT_DEV.  Retrying..."
+			sleep 5
+		else
+			echo "ERROR: losetup for BOOT_DEV failed; exiting"
+			exit 1
+		fi
+	done
+
+	echo "Mounting ROOT_DEV..."
+	cnt=0
+	until ROOT_DEV=$(losetup --show -f -o "${ROOT_OFFSET}" --sizelimit "${ROOT_LENGTH}" "${IMG_FILE}"); do
+		if [ $cnt -lt 5 ]; then
+			cnt=$((cnt + 1))
+			echo "Error in losetup for ROOT_DEV.  Retrying..."
+			sleep 5
+		else
+			echo "ERROR: losetup for ROOT_DEV failed; exiting"
+			exit 1
+		fi
+	done
+
 	echo "/boot: offset $BOOT_OFFSET, length $BOOT_LENGTH"
 	echo "/:     offset $ROOT_OFFSET, length $ROOT_LENGTH"