diff -Nru livecd-rootfs-2.358/debian/changelog livecd-rootfs-2.359/debian/changelog
--- livecd-rootfs-2.358/debian/changelog	2015-11-17 16:53:44.000000000 +0000
+++ livecd-rootfs-2.359/debian/changelog	2015-11-23 17:59:43.000000000 +0000
@@ -1,3 +1,11 @@
+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 -Nru livecd-rootfs-2.358/live-build/ubuntu-cpc/functions livecd-rootfs-2.359/live-build/ubuntu-cpc/functions
--- livecd-rootfs-2.358/live-build/ubuntu-cpc/functions	2015-11-17 16:51:07.000000000 +0000
+++ livecd-rootfs-2.359/live-build/ubuntu-cpc/functions	2015-11-23 17:59:27.000000000 +0000
@@ -46,6 +46,7 @@
 
     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 @@
     mv resolv.conf.tmp "$mountpoint/etc/resolv.conf"
     umount "$mountpoint/proc"
     umount "$mountpoint/sys"
+    umount "$mountpoint/dev/pts"
     umount "$mountpoint/dev"
     umount "$mountpoint"
 }
diff -Nru livecd-rootfs-2.358/live-build/ubuntu-cpc/hooks/033-disk-image-uefi.binary livecd-rootfs-2.359/live-build/ubuntu-cpc/hooks/033-disk-image-uefi.binary
--- livecd-rootfs-2.358/live-build/ubuntu-cpc/hooks/033-disk-image-uefi.binary	2015-11-17 16:51:07.000000000 +0000
+++ livecd-rootfs-2.359/live-build/ubuntu-cpc/hooks/033-disk-image-uefi.binary	2015-11-23 17:59:27.000000000 +0000
@@ -116,7 +116,11 @@
     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
 }