Import patches-unapplied version 2.408.16 to ubuntu/xenial-proposed

Imported using git-ubuntu import.

Changelog parent: aee4e79c87bc904e07c71ea30b16055335d55ef7

New changelog entries:
  * live-build/ubuntu-cpc/functions: call apt-get update in the chroot
    after mounting a blank /var/lib/apt, so that further operations work
    as expected; otherwise, 'apt-get purge ^grub-.*' fails on s390x because
    no such packages are known to apt.
  * live-build/ubuntu-cpc/hooks/030-root-tarball.binary: correct a missing
    unmount of /var/{lib,cache}/apt on cleanup, detected via autopkgtests.
This commit is contained in:
Steve Langasek 2017-09-12 13:25:58 -07:00 committed by usd-importer
parent aee4e79c87
commit d980e7008d
3 changed files with 14 additions and 0 deletions

11
debian/changelog vendored
View File

@ -1,3 +1,14 @@
livecd-rootfs (2.408.16) xenial; urgency=medium
* live-build/ubuntu-cpc/functions: call apt-get update in the chroot
after mounting a blank /var/lib/apt, so that further operations work
as expected; otherwise, 'apt-get purge ^grub-.*' fails on s390x because
no such packages are known to apt.
* live-build/ubuntu-cpc/hooks/030-root-tarball.binary: correct a missing
unmount of /var/{lib,cache}/apt on cleanup, detected via autopkgtests.
-- Steve Langasek <steve.langasek@ubuntu.com> Tue, 12 Sep 2017 13:25:58 -0700
livecd-rootfs (2.408.15) xenial; urgency=medium livecd-rootfs (2.408.15) xenial; urgency=medium
[ Mathieu Trudel-Lapierre ] [ Mathieu Trudel-Lapierre ]

View File

@ -90,6 +90,7 @@ setup_mountpoint() {
mount -t tmpfs none "$mountpoint/var/cache/apt" mount -t tmpfs none "$mountpoint/var/cache/apt"
mv "$mountpoint/etc/resolv.conf" resolv.conf.tmp mv "$mountpoint/etc/resolv.conf" resolv.conf.tmp
cp /etc/resolv.conf "$mountpoint/etc/resolv.conf" cp /etc/resolv.conf "$mountpoint/etc/resolv.conf"
chroot "$mountpoint" apt-get update
} }

View File

@ -29,3 +29,5 @@ umount "binary/boot/filesystem.dir/proc"
umount "binary/boot/filesystem.dir/sys" umount "binary/boot/filesystem.dir/sys"
umount -R "binary/boot/filesystem.dir/dev" umount -R "binary/boot/filesystem.dir/dev"
umount "binary/boot/filesystem.dir/tmp" umount "binary/boot/filesystem.dir/tmp"
umount "binary/boot/filesystem.dir/var/lib/apt"
umount "binary/boot/filesystem.dir/var/cache/apt"