From dc3c6121e1369c0f880a439e7ce6ce0fd25a8990 Mon Sep 17 00:00:00 2001 From: CloudBuilder Date: Tue, 25 Aug 2020 17:47:30 +0000 Subject: [PATCH] Imported 2.525.47 No reason for CPC update specified. --- debian/changelog | 16 ++++++++++++++++ live-build/auto/config | 4 ++++ .../buildd/hooks/02-disk-image-uefi.binary | 3 +-- .../buildd/hooks/52-linux-virtual-image.binary | 3 +++ 4 files changed, 24 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index cd7ae28d..ea0ac0e8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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 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 Mon, 10 Aug 2020 14:17:15 -0700 + livecd-rootfs (2.525.45) bionic; urgency=medium [ Francis Ginther ] diff --git a/live-build/auto/config b/live-build/auto/config index 5534cc91..c3fb12c4 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -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) diff --git a/live-build/buildd/hooks/02-disk-image-uefi.binary b/live-build/buildd/hooks/02-disk-image-uefi.binary index 75d93aa5..18f74bae 100755 --- a/live-build/buildd/hooks/02-disk-image-uefi.binary +++ b/live-build/buildd/hooks/02-disk-image-uefi.binary @@ -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 diff --git a/live-build/buildd/hooks/52-linux-virtual-image.binary b/live-build/buildd/hooks/52-linux-virtual-image.binary index a0c64d75..d8efab84 100755 --- a/live-build/buildd/hooks/52-linux-virtual-image.binary +++ b/live-build/buildd/hooks/52-linux-virtual-image.binary @@ -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