merge from trunk

debian/changelog

@@ -1,10 +1,16 @@
 livecd-rootfs (2.440) UNRELEASED; urgency=medium
 
+  * live-build/ubuntu-cpc/functions: don't call sleep as part of
+    umount_settle; udevadm settle is synchronous and there's no reason to
+    sleep after it.
+  * live-build/ubuntu-cpc/functions: umount_partition: don't call
+    umount_settle for each submount; just unmount them one by one and
+    settle at the end.
   * Support passing IMAGE_FLAVORS in the environment, to limit which images
     are output as part of a build; particularly useful for ubuntu-cpc builds
     which output multiple image types.
 
- -- Steve Langasek <steve.langasek@ubuntu.com>  Mon, 06 Feb 2017 22:09:17 -0800
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Wed, 08 Feb 2017 13:41:45 -0800
 
 livecd-rootfs (2.439) zesty; urgency=medium
 

live-build/ubuntu-cpc/functions

@@ -115,7 +115,6 @@ umount_settle() {
     # Unmount device, and let it settle
     umount $1
     udevadm settle
-    sleep 3
 }
 
 umount_partition() {
@@ -123,9 +122,10 @@ umount_partition() {
     mv resolv.conf.tmp "$mountpoint/etc/resolv.conf"
     for submnt in proc sys dev/pts dev tmp;
     do
-        umount_settle $mountpoint/$submnt
+        umount $mountpoint/$submnt
     done
-    umount_settle $mountpoint
+    umount $mountpoint
+    udevadm settle
 
     if [ -n "${rootfs_dev_mapper}" -a -b "${rootfs_dev_mapper}" ]; then
         # buildd's don't have /etc/mtab symlinked