Merge branch 'ubuntu/master' into new-ubuntu-oci

This commit is contained in:
Michael Hudson-Doyle 2021-04-30 11:46:16 +12:00
commit 749bdeac44
2 changed files with 11 additions and 1 deletions

10
debian/changelog vendored
View File

@ -1,3 +1,13 @@
livecd-rootfs (2.719) hirsute; urgency=medium
* Our raspi server images should have used the raspi-server seed in hirsute,
but we forgot to enable it. As it's release week and doing such invasive
changes to our Pi images is risky, let's add the dependency on
ubuntu-raspi-settings (which is seeded) to fix USB ethernet devices and
GPIO permissions (LP: #1922266).
-- Łukasz 'sil2100' Zemczak <lukasz.zemczak@ubuntu.com> Mon, 19 Apr 2021 22:54:03 +0200
livecd-rootfs (2.718) hirsute; urgency=medium
* Do not have cloud-init set the installer user's password to something

View File

@ -951,7 +951,7 @@ case $ARCH in
raspi)
# Generic Raspberry Pi images
COMPONENTS='main restricted universe multiverse'
add_package install linux-firmware-raspi2 pi-bluetooth u-boot-rpi flash-kernel u-boot-tools wpasupplicant
add_package install linux-firmware-raspi2 pi-bluetooth u-boot-rpi flash-kernel u-boot-tools wpasupplicant ubuntu-raspi-settings
BINARY_REMOVE_LINUX=false
;;
imx6)