Imported 2.713

No reason for CPC update specified.

debian/changelog

@@ -1,3 +1,19 @@
+livecd-rootfs (2.713) hirsute; urgency=medium
+
+  * Use the full name of the 'boot' flag in parted calls as it's not good
+    practice to rely on the shortened, ambiguous version.
+
+ -- Łukasz 'sil2100' Zemczak <lukasz.zemczak@ubuntu.com>  Wed, 24 Feb 2021 12:55:37 +0100
+
+livecd-rootfs (2.712) hirsute; urgency=medium
+
+  [ Cody Shepherd ]
+  * Add grub config to produce console output and install lxd-agent loader
+    to allow buildd vm images to work in lxd without requirement for manual
+    installation (LP: #1915571)
+
+ -- Robert C Jennings <robert.jennings@canonical.com>  Tue, 23 Feb 2021 14:32:19 -0600
+
 livecd-rootfs (2.711) hirsute; urgency=medium
 
   * Perform fsck on all rootfs. (LP: #1912835)

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

@@ -121,6 +121,16 @@ install_grub() {
         chroot mountpoint grub-install --target=i386-pc "${loop_device}"
     fi
 
+    cat > mountpoint/etc/default/grub.d/50-builddimg-settings.cfg << EOF
+GRUB_DEFAULT=0
+GRUB_HIDDEN_TIMEOUT=0.1
+GRUB_HIDDEN_TIMEOUT_QUIET=true
+GRUB_TIMEOUT=0.1
+GRUB_CMDLINE_LINUX_DEFAULT="console=ttyS0"
+GRUB_RECORDFAIL_TIMEOUT=0
+GRUB_TERMINAL=console
+EOF
+
     divert_grub mountpoint
     chroot mountpoint update-grub
     replace_grub_root_with_label mountpoint

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

@@ -51,7 +51,8 @@ env DEBIAN_FRONTEND=noninteractive chroot "$mount_d" apt-get \
 # Install dependencies
 env DEBIAN_FRONTEND=noninteractive chroot "$mount_d" apt-get \
     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 \
+               lxd-agent-loader
 
 # Install a kernel
 divert_grub "$mount_d"

live-build/ubuntu-cpc/hooks.d/base/disk-image.binary

@@ -50,7 +50,7 @@ create_empty_partition() {
     parted_prefix="parted $disk --script --"
     ${parted_prefix} mkpart primary "$type" "$start" "$end"
     if [ -n "$bootable" ]; then
-        ${parted_prefix} set "$part" B
+        ${parted_prefix} set "$part" boot
     fi
     ${parted_prefix} print
     ${parted_prefix} align-check opt "$part"