Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-04-26 18:41:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

merge from trunk

Browse Source
This commit is contained in:
Steve Langasek 2017-02-08 15:19:54 -08:00
commit dc38efa4bd
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
debian/changelog vendored
View File

@ -1,10 +1,16 @@
livecd-rootfs (2.440) UNRELEASED; urgency=medium livecd-rootfs (2.440) UNRELEASED; urgency=medium
* live-build/ubuntu-cpc/functions: don't call sleep as part of
umount_settle; udevadm settle is synchronous and there's no reason to
sleep after it.
* live-build/ubuntu-cpc/functions: umount_partition: don't call
umount_settle for each submount; just unmount them one by one and
settle at the end.
* Support passing IMAGE_FLAVORS in the environment, to limit which images * Support passing IMAGE_FLAVORS in the environment, to limit which images
are output as part of a build; particularly useful for ubuntu-cpc builds are output as part of a build; particularly useful for ubuntu-cpc builds
which output multiple image types. which output multiple image types.
-- Steve Langasek <steve.langasek@ubuntu.com> Mon, 06 Feb 2017 22:09:17 -0800 -- Steve Langasek <steve.langasek@ubuntu.com> Wed, 08 Feb 2017 13:41:45 -0800
livecd-rootfs (2.439) zesty; urgency=medium livecd-rootfs (2.439) zesty; urgency=medium

6
live-build/ubuntu-cpc/functions
View File

@ -115,7 +115,6 @@ umount_settle() {
# Unmount device, and let it settle # Unmount device, and let it settle
umount $1 umount $1
udevadm settle udevadm settle
sleep 3
} }
umount_partition() { umount_partition() {
@ -123,9 +122,10 @@ umount_partition() {
mv resolv.conf.tmp "$mountpoint/etc/resolv.conf" mv resolv.conf.tmp "$mountpoint/etc/resolv.conf"
for submnt in proc sys dev/pts dev tmp; for submnt in proc sys dev/pts dev tmp;
do do
umount_settle $mountpoint/$submnt umount $mountpoint/$submnt
done done
umount_settle $mountpoint umount $mountpoint
udevadm settle
if [ -n "${rootfs_dev_mapper}" -a -b "${rootfs_dev_mapper}" ]; then if [ -n "${rootfs_dev_mapper}" -a -b "${rootfs_dev_mapper}" ]; then
# buildd's don't have /etc/mtab symlinked # buildd's don't have /etc/mtab symlinked