From 345d6cef79bf94d684501eb3ba2f115fd86ccba6 Mon Sep 17 00:00:00 2001
From: CloudBuilder <cloud-image-builders@lists.canonical.com>
Date: Thu, 3 Jun 2021 17:19:08 +0000
Subject: [PATCH] Imported 2.664.23

No reason for CPC update specified.
---
 debian/changelog                              | 14 +++++++++++++
 live-build/auto/config                        | 20 +++++++++++++++++++
 .../buildd/hooks/02-disk-image-uefi.binary    | 10 ++++++++++
 .../hooks/52-linux-virtual-image.binary       |  3 ++-
 4 files changed, 46 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index f0743efc..21558394 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+livecd-rootfs (2.664.23) focal; urgency=medium
+
+  * Adding dependencies for Active Directory support (LP: #1921374)
+
+ -- Jean-Baptiste Lallement <jean-baptiste.lallement@ubuntu.com>  Thu, 20 May 2021 17:52:20 +0200
+
+livecd-rootfs (2.664.22) focal; 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>  Thu, 20 May 2021 17:07:01 -0700
+
 livecd-rootfs (2.664.21) focal; urgency=medium
 
   [ Thomas Bechtold ]
diff --git a/live-build/auto/config b/live-build/auto/config
index 702af138..86e506e3 100755
--- a/live-build/auto/config
+++ b/live-build/auto/config
@@ -1116,6 +1116,26 @@ EOF
 		;;
 esac
 
+if [ $PROJECT = ubuntu ]; then
+	cat > config/hooks/001-active-directory.chroot <<EOF
+#!/bin/sh
+
+set -e
+
+echo "I: Adding dependencies for Active Directory support (Workaround LP: #1921862)"
+
+apt-get -y update
+
+apt-get -y install sssd realmd adcli krb5-config
+
+echo "I: Removing /var/lib/apt/lists/*"
+find /var/lib/apt/lists/ -type f | xargs rm -f
+
+echo "I: Removing /var/cache/apt/*.bin"
+rm -f /var/cache/apt/*.bin/
+EOF
+fi
+
 if [ $PROJECT = ubuntu-server ] && [ "${SUBPROJECT:-}" != live ]; then
 	cat > config/hooks/100-remove-fstab.chroot <<EOF
 #! /bin/sh
diff --git a/live-build/buildd/hooks/02-disk-image-uefi.binary b/live-build/buildd/hooks/02-disk-image-uefi.binary
index f75e3aa2..8b84afd3 100755
--- a/live-build/buildd/hooks/02-disk-image-uefi.binary
+++ b/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
diff --git a/live-build/buildd/hooks/52-linux-virtual-image.binary b/live-build/buildd/hooks/52-linux-virtual-image.binary
index 39ea7780..7c43e7b1 100755
--- a/live-build/buildd/hooks/52-linux-virtual-image.binary
+++ b/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"