From f29be59f0dc40b42b32337cdea88f05bcdacf987 Mon Sep 17 00:00:00 2001 From: CloudBuilder <cloud-image-builders@lists.canonical.com> Date: Thu, 10 Dec 2020 01:09:24 +0000 Subject: [PATCH] Imported 2.708 No reason for CPC update specified. --- debian/changelog | 6 ++++++ live-build/cidata/meta-data.sample | 2 +- live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 264bfac5..432a206b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +livecd-rootfs (2.708) hirsute; urgency=medium + + * disk-image-uefi: fix riscv64 subarch user-data. + + -- Dimitri John Ledkov <xnox@ubuntu.com> Tue, 08 Dec 2020 09:15:36 +0000 + livecd-rootfs (2.707) hirsute; urgency=medium * qcow2-image: unbreak builds without subarch. diff --git a/live-build/cidata/meta-data.sample b/live-build/cidata/meta-data.sample index fa219b17..11802477 100644 --- a/live-build/cidata/meta-data.sample +++ b/live-build/cidata/meta-data.sample @@ -1,4 +1,4 @@ -# NB! This is a sample, copy to "meta-data" and mofiy to take effect +# NB! This is a sample, copy to "meta-data" and modify to take effect # NB! Also see user-data.sample and network-config.sample # This is the meta-data configuration file for cloud-init. Typically this just diff --git a/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary b/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary index 080dab51..fcf3c7e0 100755 --- a/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary +++ b/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary @@ -152,7 +152,7 @@ install_grub() { mkdir -p mountpoint/var/lib/cloud/seed/nocloud-net cat <<EOF >mountpoint/var/lib/cloud/seed/nocloud-net/meta-data instance-id: iid-$(openssl rand -hex 8) -END +EOF cat <<EOF >mountpoint/var/lib/cloud/seed/nocloud-net/user-data #cloud-config chpasswd: