Imported 2.525.47

No reason for CPC update specified.
This commit is contained in:
CloudBuilder 2020-08-25 17:47:30 +00:00
parent 2720f4bdb3
commit dc3c6121e1
4 changed files with 24 additions and 2 deletions

16
debian/changelog vendored
View File

@ -1,3 +1,19 @@
livecd-rootfs (2.525.47) bionic; urgency=medium
* Apparently the lxd appliance needs to use a custom track (4.0) and since
model assertions do not accept track names in required-snaps, we need to do
this by hand during build. (LP: #1891505)
-- Łukasz 'sil2100' Zemczak <lukasz.zemczak@ubuntu.com> Wed, 12 Aug 2020 15:58:19 +0200
livecd-rootfs (2.525.46) bionic; urgency=medium
[ Cody Shepherd ]
* Add dist-upgrade to bootable-buildd hook to ensure the built image
doesn't contain vulnerable kernels or other packages. LP: #1891061.
-- Steve Langasek <steve.langasek@ubuntu.com> Mon, 10 Aug 2020 14:17:15 -0700
livecd-rootfs (2.525.45) bionic; urgency=medium
[ Francis Ginther ]

View File

@ -219,6 +219,10 @@ case $IMAGEFORMAT in
[ -z "${SUBARCH:-}" ] \
&& UBUNTU_IMAGE_ARGS="$UBUNTU_IMAGE_ARGS --image-size 3700M"
;;
# Some appliances need different snap tracks
lxd-core18*)
EXTRA_SNAPS="lxd=4.0"
;;
esac
case $SUITE in
xenial)

View File

@ -84,8 +84,7 @@ install_grub() {
efi_target=arm-efi
;;
amd64)
chroot mountpoint apt-get install -qqy grub-pc
chroot mountpoint apt-get install -qqy grub-efi-amd64-signed shim-signed
chroot mountpoint apt-get install -qqy grub-pc shim-signed
efi_target=x86_64-efi
;;
esac

View File

@ -39,6 +39,9 @@ trap cleanup_linux_virtual EXIT
# Install dependencies
env DEBIAN_FRONTEND=noninteractive chroot "$mount_d" apt-get \
update --assume-yes
# Perform a dist-upgrade to pull in package updates
env DEBIAN_FRONTEND=noninteractive chroot "$mount_d" apt-get \
dist-upgrade --assume-yes
env DEBIAN_FRONTEND=noninteractive chroot "$mount_d" apt-get \
install -y lsb-release locales initramfs-tools busybox-initramfs \
udev dbus netplan.io cloud-init openssh-server sudo snapd