live-build/ubuntu-cpc/hooks/042-vagrant.binary: fix unmount handling

so that the teardown is done properly /before/ we try to make an
image from our filesystem, since otherwise /etc/resolv.conf is broken.
LP: #1621393.

debian/changelog

@@ -1,11 +1,18 @@
 livecd-rootfs (2.430) UNRELEASED; urgency=medium
 
+  [ Michael Vogt ]
   * live-build/ubuntu-core/hooks/01-setup_user.chroot:
     - do not create "ubuntu" user for ubuntu-core anymore, the
       console-conf package will create this user now
   * live-build/ubuntu-core/hooks/02-add_user_to_groups.chroot
     - dropped
 
+  [ Steve Langasek ]
+  * live-build/ubuntu-cpc/hooks/042-vagrant.binary: fix unmount handling
+    so that the teardown is done properly /before/ we try to make an
+    image from our filesystem, since otherwise /etc/resolv.conf is broken.
+    LP: #1621393.
+
  -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 02 Sep 2016 17:03:57 +0200
 
 livecd-rootfs (2.429) yakkety; urgency=medium

live-build/ubuntu-cpc/hooks/042-vagrant.binary

@@ -39,7 +39,9 @@ create_derivative "disk" "vagrant" #sets ${derivative_img}
 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 @@ chroot ${mount_d} apt-get update
 # 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)