From c97c00d7499dbbeeca330bafcb64cc04ab5b3680 Mon Sep 17 00:00:00 2001
From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Mon, 7 Dec 2015 11:20:57 +0100
Subject: [PATCH] manually merge upload of 2.359

---
 debian/changelog                                       | 10 +++++++++-
 live-build/ubuntu-cpc/functions                        |  2 ++
 live-build/ubuntu-cpc/hooks/033-disk-image-uefi.binary |  4 ++++
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 06b47c65..73d1ed92 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,18 @@
-livecd-rootfs (2.359) xenial; urgency=medium
+livecd-rootfs (2.360) UNRELEASED; urgency=medium
 
   * live-build/ubuntu-core/hooks/01-setup_user.chroot:
     - add default ubuntu user to "adm" and "sudo" groups
 
  -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 07 Dec 2015 11:03:35 +0100
 
+livecd-rootfs (2.359) xenial; urgency=medium
+
+  * ubuntu-cpc:
+    - add devpts-live to hook builds
+    - add logic to settle the disks after UEFI builds
+
+ -- Ben Howard <ben.howard@ubuntu.com>  Mon, 23 Nov 2015 09:34:57 -0700
+
 livecd-rootfs (2.358) xenial; urgency=medium
 
   * Fix typo in ubuntu-cpc preventing non-intel builds.
diff --git a/live-build/ubuntu-cpc/functions b/live-build/ubuntu-cpc/functions
index b5500e70..a966840f 100644
--- a/live-build/ubuntu-cpc/functions
+++ b/live-build/ubuntu-cpc/functions
@@ -46,6 +46,7 @@ mount_partition() {
 
     mount "$partition" "$mountpoint"
     mount --bind /dev "$mountpoint/dev"
+    mount devpts-live -t devpts "$mountpoint/dev/pts"
     mount proc-live -t proc "$mountpoint/proc"
     mount sysfs-live -t sysfs "$mountpoint/sys"
     mv "$mountpoint/etc/resolv.conf" resolv.conf.tmp
@@ -58,6 +59,7 @@ umount_partition() {
     mv resolv.conf.tmp "$mountpoint/etc/resolv.conf"
     umount "$mountpoint/proc"
     umount "$mountpoint/sys"
+    umount "$mountpoint/dev/pts"
     umount "$mountpoint/dev"
     umount "$mountpoint"
 }
diff --git a/live-build/ubuntu-cpc/hooks/033-disk-image-uefi.binary b/live-build/ubuntu-cpc/hooks/033-disk-image-uefi.binary
index e0e90c18..88530c6e 100755
--- a/live-build/ubuntu-cpc/hooks/033-disk-image-uefi.binary
+++ b/live-build/ubuntu-cpc/hooks/033-disk-image-uefi.binary
@@ -116,7 +116,11 @@ EOF
     chroot mountpoint apt-get -y update
 
     rm mountpoint/tmp/device.map
+    sync
     umount mountpoint/boot/efi
+    sleep 5
+    udevadm settle
+    mount
     umount_partition mountpoint
     rmdir mountpoint
 }