Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-05-16 13:21:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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.
This commit is contained in:
Steve Langasek 2016-09-09 15:56:47 -07:00
parent d4dd5b3a8a
commit 8855f05191
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
debian/changelog vendored
View File

@ -1,11 +1,18 @@
livecd-rootfs (2.430) UNRELEASED; urgency=medium livecd-rootfs (2.430) UNRELEASED; urgency=medium
[ Michael Vogt ]
* live-build/ubuntu-core/hooks/01-setup_user.chroot: * live-build/ubuntu-core/hooks/01-setup_user.chroot:
- do not create "ubuntu" user for ubuntu-core anymore, the - do not create "ubuntu" user for ubuntu-core anymore, the
console-conf package will create this user now console-conf package will create this user now
* live-build/ubuntu-core/hooks/02-add_user_to_groups.chroot * live-build/ubuntu-core/hooks/02-add_user_to_groups.chroot
- dropped - 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 -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 02 Sep 2016 17:03:57 +0200
livecd-rootfs (2.429) yakkety; urgency=medium livecd-rootfs (2.429) yakkety; urgency=medium

6
live-build/ubuntu-cpc/hooks/042-vagrant.binary
View File

@ -39,7 +39,9 @@ create_derivative "disk" "vagrant" #sets ${derivative_img}
mount_disk_image ${derivative_img} ${mount_d} mount_disk_image ${derivative_img} ${mount_d}
cleanup_vagrant() { 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} rm -rf ${box_d} ${seed_d} ${mount_d} ${derivative_img}
} }
trap cleanup_vagrant EXIT trap cleanup_vagrant EXIT
@ -49,6 +51,8 @@ chroot ${mount_d} apt-get update
# avoid pulling into a cloud image. # avoid pulling into a cloud image.
chroot ${mount_d} apt-get install --no-install-recommends -y virtualbox-guest-utils chroot ${mount_d} apt-get install --no-install-recommends -y virtualbox-guest-utils
chroot ${mount_d} apt-get clean chroot ${mount_d} apt-get clean
umount_disk_image "$mount_d"
rmdir "$mount_d"
# Used to identify bits # Used to identify bits
suite=$(chroot chroot lsb_release -c -s) suite=$(chroot chroot lsb_release -c -s)