From 6eb5365acd78ddccfae98da2dbfd5f27fa8bcca1 Mon Sep 17 00:00:00 2001 From: CloudBuilder Date: Tue, 11 Aug 2020 03:55:23 +0000 Subject: [PATCH] Imported 2.681 No reason for CPC update specified. --- debian/changelog | 17 +++++++++++++++++ .../buildd/hooks/02-disk-image-uefi.binary | 3 +-- .../buildd/hooks/52-linux-virtual-image.binary | 3 +++ .../hooks/040-hyperv-desktop-images.binary | 2 +- 4 files changed, 22 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 88d6eccf..f991c1d0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,20 @@ +livecd-rootfs (2.681) groovy; urgency=medium + + [ Patrick Wu ] + * Use the Azure kernel for the HyperV gallery images. + + -- Steve Langasek Mon, 10 Aug 2020 14:54:25 -0700 + +livecd-rootfs (2.680) groovy; urgency=medium + + [ Cody Shepherd ] + * Add dist-upgrade to bootable-buildd hook to ensure the built image + doesn't contain vulnerable kernels or other packages. + * Don't explicitly install grub-efi-amd64-signed, it's a dependency of + shim-signed. + + -- Steve Langasek Tue, 04 Aug 2020 12:30:34 -0700 + livecd-rootfs (2.679) groovy; urgency=medium * Handle seeded lxd snap with channel name for ubuntu-cpc:minimized 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 diff --git a/live-build/ubuntu/hooks/040-hyperv-desktop-images.binary b/live-build/ubuntu/hooks/040-hyperv-desktop-images.binary index 5bc066c0..d8d0c993 100644 --- a/live-build/ubuntu/hooks/040-hyperv-desktop-images.binary +++ b/live-build/ubuntu/hooks/040-hyperv-desktop-images.binary @@ -40,7 +40,7 @@ trap cleanup_hyperv EXIT # Perform customisations chroot "${scratch_d}" apt-get update -y -chroot "${scratch_d}" apt-get -y install xrdp linux-tools-virtual linux-cloud-tools-virtual +chroot "${scratch_d}" apt-get -y install xrdp linux-azure linux-tools-azure linux-cloud-tools-azure cat > ${scratch_d}/etc/modules-load.d/hyperv.conf << EOF ${IMAGE_STR}