=== modified file 'live-build/ubuntu-cpc/hooks/042-vagrant.binary'
--- live-build/ubuntu-cpc/hooks/042-vagrant.binary	2016-07-21 16:14:49 +0000
+++ live-build/ubuntu-cpc/hooks/042-vagrant.binary	2016-09-09 21:49:45 +0000
@@ -39,7 +39,9 @@
 mount_disk_image ${derivative_img} ${mount_d}
 
 cleanup_vagrant() {
-    umount_disk_image ${mount_d}
+    if [ -d "${mount_d}" ]; then
+        umount_disk_image ${mount_d}
+    fi
     rm -rf ${box_d} ${seed_d} ${mount_d} ${derivative_img}
 }
 trap cleanup_vagrant EXIT
@@ -49,6 +51,8 @@
 # avoid pulling into a cloud image.
 chroot ${mount_d} apt-get install --no-install-recommends -y virtualbox-guest-utils
 chroot ${mount_d} apt-get clean
+umount_disk_image "$mount_d"
+rmdir "$mount_d"
 
 # Used to identify bits
 suite=$(chroot chroot lsb_release -c -s)