Merge lp:~brightbox/ubuntu/natty/cloud-initramfs-tools/fix-765843 into lp:ubuntu/natty/cloud-initramfs-tools

[Neil Wilson]

Fixes the race condition in 'growroot' by replacing the 'wait-for-root' guard with 'udevadm settle'.

[Clint Byrum (clint-fewbar)]

Marking as work in progress, since this is not ready for merge into lp:ubuntu/natty/cloud-initramfs-tools. That will require an SRU-friendly changelog update, and will require the fix that was merged into Scott's tree to land in Oneiric.

[Scott Moser (smoser)]

I've marked this as "merged" as it has been merged into
lp:~cloud-init-dev/ubuntu/oneiric/cloud-initramfs-tools/oneiric (the "upstream" packaging branch)

And I have proposed that for merging into lp:ubuntu/oneiric/cloud-initramfs-tools.
https://code.launchpad.net/~cloud-init-dev/ubuntu/oneiric/cloud-initramfs-tools/oneiric/+merge/63862

=== modified file 'growroot/scripts/local-bottom/growroot'
--- growroot/scripts/local-bottom/growroot	2011-02-25 12:44:03 +0000
+++ growroot/scripts/local-bottom/growroot	2011-04-21 14:03:27 +0000
@@ -65,11 +65,13 @@
 sfdisk -R "${rootdisk}" ||
 	msg "failed to re-read partition for ${rootdisk}"
 
-# this is taken from 'mountroot' function
-#   see /usr/share/initramfs-tools/scripts/local
-FSTYPE=$(wait-for-root "${ROOT}" ${ROOTDELAY:-30})
 roflag="-r"
 [ "${readonly}" = "y" ] || roflag="-w"
+
+# Wait for the partition re-read events to complete 
+# so that the root partition is available when we try and mount it.
+udevadm settle --timeout ${ROOTDELAY:-30}
+
 mount ${roflag} ${FSTYPE:+-t ${FSTYPE} }${ROOTFLAGS} ${ROOT} ${rootmnt} ||
 	fail "failed to re-mount ${ROOT}. this is bad!"