Update d/ch for 2.828.4 release

By invoking LXD, lxd-installer will install LXD from the right
place, thereby make it simpler for us to not hardcode the
channel and manually snap install it.

(cherry picked from commit 795927c48cf2e763e8f222e8c27c63e71d966a5f)

debian/changelog

@@ -1,3 +1,32 @@
+livecd-rootfs (2.828.4) lunar; urgency=medium
+
+  * unminimize: Use lxd-installer to install LXD itself (LP: #2036725)
+
+ -- Utkarsh Gupta <utkarsh@ubuntu.com>  Thu, 11 Jan 2024 16:46:28 +0530
+
+livecd-rootfs (2.828.3) lunar; urgency=medium
+
+  [ Heinrich Schuchardt ]
+  * arm: fix console parameter for ARM cloud-images (LP: #2036730)
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Thu, 07 Dec 2023 08:51:51 -0800
+
+livecd-rootfs (2.828.2) lunar; urgency=medium
+
+  [ Steve Langasek ]
+  * The chroot tmpfs mount should only be /var/lib/apt/lists, not
+    /var/lib/apt; the latter breaks changes to /var/lib/apt/extended_states.
+    (LP: #2036195).
+
+ -- Phil Roche <phil.roche@canonical.com>  Thu, 19 Oct 2023 17:30:20 +0100
+ 
+livecd-rootfs (2.828.1) lunar; urgency=medium
+
+  * Fix unminimize to correctly list packages. (LP: #1996489)
+  * Install LXD snap from stable/ubuntu-<version> channel. (LP: #2036725)
+
+ -- Utkarsh Gupta <utkarsh@ubuntu.com>  Wed, 04 Oct 2023 13:42:33 +0530
+
 livecd-rootfs (2.828) lunar; urgency=medium
 
   * 099-ubuntu-image-customization.chroot: Remove redundant creation of oem

live-build/auto/build

@@ -241,18 +241,18 @@ if [ -f /etc/dpkg/dpkg.cfg.d/excludes ] || [ -f /etc/dpkg/dpkg.cfg.d/excludes.dp
     dpkg -S /usr/share/man/ |sed 's|, |\n|g;s|: [^:]*$||' | DEBIAN_FRONTEND=noninteractive xargs apt-get install --reinstall -y
     echo "Reinstalling packages with system documentation in /usr/share/doc/ .."
     # This step processes the packages which still have missing documentation
-    dpkg --verify --verify-format rpm | awk '/..5......   \/usr\/share\/doc/ {print $2}' | sed 's|/[^/]*$||' | sort |uniq \
+    dpkg --verify --verify-format rpm | awk '$2 ~ /\/usr\/share\/doc/ {print $2}' | sed 's|/[^/]*$||' | sort | uniq \
          | xargs dpkg -S | sed 's|, |\n|g;s|: [^:]*$||' | uniq | DEBIAN_FRONTEND=noninteractive xargs apt-get install --reinstall -y
     echo "Restoring system translations..."
     # This step processes the packages which still have missing translations
-    dpkg --verify --verify-format rpm | awk '/..5......   \/usr\/share\/locale/ {print $2}' | sed 's|/[^/]*$||' | sort |uniq \
+    dpkg --verify --verify-format rpm | awk '$2 ~ /\/usr\/share\/locale/ {print $2}' | sed 's|/[^/]*$||' | sort | uniq \
          | xargs dpkg -S | sed 's|, |\n|g;s|: [^:]*$||' | uniq | DEBIAN_FRONTEND=noninteractive xargs apt-get install --reinstall -y
-    if dpkg --verify --verify-format rpm | awk '/..5......   \/usr\/share\/doc/ {exit 1}'; then
+    if dpkg --verify --verify-format rpm | awk '$2 ~ /\/usr\/share\/doc/ {exit 1}'; then
         echo "Documentation has been restored successfully."
         rm /etc/dpkg/dpkg.cfg.d/excludes.dpkg-tmp
     else
         echo "There are still files missing from /usr/share/doc/:"
-        dpkg --verify --verify-format rpm | awk '/..5......   \/usr\/share\/doc/ {print " " $2}'
+        dpkg --verify --verify-format rpm | awk '$2 ~ /\/usr\/share\/doc/ {print " " $2}'
         echo "You may want to try running this script again or you can remove"
         echo "/etc/dpkg/dpkg.cfg.d/excludes.dpkg-tmp and restore the files manually."
     fi
@@ -285,11 +285,13 @@ fi
 		if [ "$PROJECT" = "ubuntu-cpc" ] || [ "$PROJECT" = "ubuntu-server" ]; then
 			cat >> chroot/usr/local/sbin/unminimize <<'EOF'
 
+# installing LXD using the lxd-installer by simply invoking it
+echo "Invoking LXD so that it can be installed by the lxd-installer's script.."
+lxd --version
+
 echo "Removing lxd installer package..."
 apt-get purge -y lxd-installer
 
-echo "Installing lxd from snap..."
-snap install lxd
 EOF
 		fi
 		cat >> chroot/usr/local/sbin/unminimize <<'EOF'

live-build/functions

@@ -143,7 +143,7 @@ setup_mountpoint() {
     # cgroup2 mount for LP: 1944004
     mount -t cgroup2 none "$mountpoint/sys/fs/cgroup"
     mount -t tmpfs none "$mountpoint/tmp"
-    mount -t tmpfs none "$mountpoint/var/lib/apt"
+    mount -t tmpfs none "$mountpoint/var/lib/apt/lists"
     mount -t tmpfs none "$mountpoint/var/cache/apt"
     mv "$mountpoint/etc/resolv.conf" resolv.conf.tmp
     cp /etc/resolv.conf "$mountpoint/etc/resolv.conf"

live-build/ubuntu-cpc/hooks.d/chroot/999-cpc-fixes.chroot

@@ -197,6 +197,16 @@ fi
 psuedo_grub_probe > "${gprobe}"
 chmod 755 "${gprobe}"
 
+case $arch in
+   armhf|arm64)
+      # QEMU virt machine provides AMBA PrimeCell UART
+      serial_console='ttyAMA0'
+      ;;
+   *)
+      serial_console='ttyS0'
+      ;;
+esac
+
 # for Quantal and later, use /etc/default/grub.d functionality
 # rather than modifying the grub configuration itself.
 # This avoids the mess of having to do dpkg stuff
@@ -213,7 +223,7 @@ GRUB_RECORDFAIL_TIMEOUT=0
 GRUB_TIMEOUT=0
 
 # Set the default commandline
-GRUB_CMDLINE_LINUX_DEFAULT="console=tty1 console=ttyS0"
+GRUB_CMDLINE_LINUX_DEFAULT="console=tty1 console=${serial_console}"
 
 # Set the grub console type
 GRUB_TERMINAL=console