From f83f97bc8bb56fc371a854e550b55375125ec474 Mon Sep 17 00:00:00 2001 From: Robert C Jennings Date: Thu, 25 May 2017 20:35:30 -0500 Subject: [PATCH] ubuntu-cpc: Fix unmount handling (LP: #1621393) [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. --- debian/changelog | 10 ++++++++++ live-build/ubuntu-cpc/hooks/042-vagrant.binary | 6 +++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index a08c43f0..7bcd8f12 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +livecd-rootfs (2.209.18) trusty; urgency=medium + + [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. + + -- Robert C Jennings Tue, 24 May 2017 14:44:47 -0500 + livecd-rootfs (2.209.17) trusty; urgency=medium [ Louis Zuckerman ] diff --git a/live-build/ubuntu-cpc/hooks/042-vagrant.binary b/live-build/ubuntu-cpc/hooks/042-vagrant.binary index 6fd02d9c..ca08e44e 100644 --- a/live-build/ubuntu-cpc/hooks/042-vagrant.binary +++ b/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)