From 012b0e3f34ca9281061de351d73cb86311263ef9 Mon Sep 17 00:00:00 2001
From: Daniel Drake <dsd@laptop.org>
Date: Tue, 18 Sep 2012 17:42:01 +0000
Subject: sd_card_image: work around occasional failure to probe loop partitions

On some systems, we seem particularly prone to a race condition where
losetup cannot probe loop partitions because udev is probing the newly
appeared loop device.

Add a repeated fallback to partx to work around this situation.
---
diff --git a/modules/sd_card_image/image.50.makefs.sh b/modules/sd_card_image/image.50.makefs.sh
index 1b692f0..b259409 100644
--- a/modules/sd_card_image/image.50.makefs.sh
+++ b/modules/sd_card_image/image.50.makefs.sh
@@ -83,6 +83,16 @@ EOF
 	boot_loop="${disk_loop}p1"
 	root_loop="${disk_loop}p2"
 
+	# Work around occasional failure for loop partitions to appear
+	# http://marc.info/?l=linux-kernel&m=134271282127702&w=2
+	local i=0
+	while ! [ -e "$boot_loop" ]; do
+		partx -a -v $disk_loop
+		sleep 1
+		(( ++i ))
+		[ $i -ge 10 ] && break
+	done
+
 	echo "Create filesystems..."
 	mke2fs -O dir_index,^resize_inode -L Boot -F $boot_loop
 	mount $boot_loop $BOOT
--
cgit v0.9.1