Imported 2.525.39

No reason for CPC update specified.
This commit is contained in:
CloudBuilder 2020-01-30 09:47:50 +00:00
parent 5e087d55ef
commit 6f98b70dc5
3 changed files with 47 additions and 2 deletions

24
debian/changelog vendored
View File

@ -1,3 +1,27 @@
livecd-rootfs (2.525.39) bionic; urgency=medium
* Ensure seed partition is mounted on no-cloud images which use system-boot
as their seed (LP: #1860046)
* Have getty wait for cloud-init to complete to ensure that the default
user exists before presenting a login prompt
-- Dave Jones <dave.jones@canonical.com> Fri, 24 Jan 2020 15:17:56 +0000
livecd-rootfs (2.525.38) bionic; urgency=medium
* Support generating a .disk/info file via ubuntu-image from the passed-in
datestamp parameter (using the $NOW environment variable). (LP: #1856684)
* Switch raspi2-hwe-18.04-edge to raspi2-hwe-18.04. (LP: #1859478)
-- Łukasz 'sil2100' Zemczak <lukasz.zemczak@ubuntu.com> Wed, 22 Jan 2020 09:18:06 +0100
livecd-rootfs (2.525.37) bionic; urgency=medium
* Use the raspi2-hwe-18.04-edge kernel flavour for the raspi3 images. This
kernel is required for proper pi4 support. (LP: #1859478)
-- Łukasz 'sil2100' Zemczak <lukasz.zemczak@ubuntu.com> Mon, 13 Jan 2020 15:33:20 +0100
livecd-rootfs (2.525.36) bionic; urgency=medium
* Preserve apt preferences created by any package we install (i.e.

View File

@ -196,13 +196,20 @@ case $IMAGEFORMAT in
;;
esac
# If we have a datestamp coming from cdimage, use that to populate
# .disk/info on the target image
if [ -n "$NOW" ]; then
echo "$NOW" > config/disk-info
UBUNTU_IMAGE_ARGS="$UBUNTU_IMAGE_ARGS --disk-info config/disk-info"
fi
if [ $PROJECT = "ubuntu-core" ]; then
# snap-based core images
case $MODEL in
pc-amd64|pc-i386)
[ -z "${SUBARCH:-}" ] \
&& UBUNTU_IMAGE_ARGS="--image-size 3700M"
&& UBUNTU_IMAGE_ARGS="$UBUNTU_IMAGE_ARGS --image-size 3700M"
;;
esac
case $SUITE in
@ -882,7 +889,7 @@ case $ARCH in
;;
raspi3)
COMPONENTS='main restricted universe multiverse'
KERNEL_FLAVOURS=raspi2
KERNEL_FLAVOURS=raspi2-hwe-18.04
add_package install linux-firmware-raspi2 u-boot-rpi flash-kernel u-boot-tools wpasupplicant
BINARY_REMOVE_LINUX=false
;;

View File

@ -19,5 +19,19 @@ datasource_list: [ NoCloud, None ]
datasource:
NoCloud:
fs_label: system-boot
EOF
mkdir -p /etc/systemd/system/cloud-init-local.service.d
cat << EOF > /etc/systemd/system/cloud-init-local.service.d/mount-seed.conf
# Ensure our customized seed location is mounted prior to execution
[Unit]
RequiresMountsFor=/boot/firmware
EOF
mkdir -p /etc/systemd/system/cloud-config.service.d
cat << EOF > /etc/systemd/system/cloud-config.service.d/getty-wait.conf
# Wait for cloud-init to finish (creating users, etc.) before running getty
[Unit]
Before=getty.target
EOF
fi