Merge remote-tracking branch 'codyshepherd/buildd/hide-grub-menu-gg' into ubuntu/groovy

debian/changelog

@@ -1,3 +1,11 @@
+livecd-rootfs (2.694.6) UNRELEASED; urgency=medium
+
+  * 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)
+
+ -- Cody Shepherd <cody.shepherd@canonical.com>  Mon, 01 Mar 2021 09:00:39 -0800
+
 livecd-rootfs (2.694.5) groovy; urgency=medium
 
   [ Thomas Bechtold ]

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

@@ -44,7 +44,8 @@ env DEBIAN_FRONTEND=noninteractive chroot "$mount_d" apt-get \
     dist-upgrade --assume-yes
 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"