Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-05-08 17:31:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'codyshepherd/bootable-buildd/dist-upgrade/focal' into ubuntu/focal

Browse Source
This commit is contained in:
Steve Langasek 2020-08-04 12:32:31 -07:00
commit 2404d27f5b
3 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
debian/changelog vendored
View File

@ -1,9 +1,16 @@
livecd-rootfs (2.664.5) focal; urgency=medium livecd-rootfs (2.664.5) focal; urgency=medium
[ Robert C Jennings ]
* Handle seeded lxd snap with channel name for ubuntu-cpc:minimized * Handle seeded lxd snap with channel name for ubuntu-cpc:minimized
(LP: #1889470) (LP: #1889470)
-- Robert C Jennings <robert.jennings@canonical.com> Wed, 29 Jul 2020 14:54:19 -0500 [ 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 <steve.langasek@ubuntu.com> Tue, 04 Aug 2020 12:39:27 -0700
livecd-rootfs (2.664.4) focal; urgency=medium livecd-rootfs (2.664.4) focal; urgency=medium

3
live-build/buildd/hooks/02-disk-image-uefi.binary
View File

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

3
live-build/buildd/hooks/52-linux-virtual-image.binary
View File

@ -39,6 +39,9 @@ trap cleanup_linux_virtual EXIT
# Install dependencies # Install dependencies
env DEBIAN_FRONTEND=noninteractive chroot "$mount_d" apt-get \ env DEBIAN_FRONTEND=noninteractive chroot "$mount_d" apt-get \
update --assume-yes 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 \ env DEBIAN_FRONTEND=noninteractive chroot "$mount_d" apt-get \
install -y lsb-release locales initramfs-tools busybox-initramfs \ install -y lsb-release locales initramfs-tools busybox-initramfs \
udev dbus netplan.io cloud-init openssh-server sudo snapd udev dbus netplan.io cloud-init openssh-server sudo snapd