Imported 2.708

No reason for CPC update specified.

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.

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

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: