From 4131dad0da60419bf3ea366b1e0fb3dad6c60eba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20=27sil2100=27=20Zemczak?=
 <lukasz.zemczak@canonical.com>
Date: Fri, 29 Oct 2021 15:34:53 +0200
Subject: [PATCH] Fix rootfs resize and a grub2 font warning.

---
 debian/changelog                                          | 8 ++++++++
 live-build/auto/config                                    | 3 +++
 .../ubuntu/hooks/099-ubuntu-image-customization.chroot    | 7 +++++++
 3 files changed, 18 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index c9a42363..6c07e49b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+livecd-rootfs (2.664.33) UNRELEASED; urgency=medium
+
+  * Install cloud-initramfs-growroot to actually enable rootfs resize.
+  * Fix a grub error by making sure the unicode.pf2 font is installed in the
+    right path for preinstalled amd64 desktop images.
+
+ -- Łukasz 'sil2100' Zemczak <lukasz.zemczak@ubuntu.com>  Fri, 29 Oct 2021 15:33:34 +0200
+
 livecd-rootfs (2.664.32) focal; urgency=medium
 
   * 099-ubuntu-image-customization.chroot: fix a typo in it.
diff --git a/live-build/auto/config b/live-build/auto/config
index b3fa80c1..6d5ad897 100755
--- a/live-build/auto/config
+++ b/live-build/auto/config
@@ -601,6 +601,9 @@ case $PROJECT in
 			desktop-preinstalled)
 				add_task install minimal standard ubuntu-desktop
 				if [ "$SUBARCH" = "intel-iot" ]; then
+					# Since for non-pi we don't have any seeds yet but we want to be able to
+					# grow the rootfs, manually install cloud-initramfs-growroot during build
+					add_package install cloud-initramfs-growroot
 				    	KERNEL_FLAVOURS='image-intel'
 					COMPONENTS='main restricted universe'
 					OPTS="${OPTS:+$OPTS }--initramfs=none"
diff --git a/live-build/ubuntu/hooks/099-ubuntu-image-customization.chroot b/live-build/ubuntu/hooks/099-ubuntu-image-customization.chroot
index b354f3dd..9c67e55c 100644
--- a/live-build/ubuntu/hooks/099-ubuntu-image-customization.chroot
+++ b/live-build/ubuntu/hooks/099-ubuntu-image-customization.chroot
@@ -105,6 +105,13 @@ PSUEDO_GRUB_PROBE
             # Generate grub.cfg
             /usr/sbin/update-grub2
 
+            # Somehow grub doesn't copy unicode.pf2 to the right fonts
+            # directory.
+	    if [ ! -e "/boot/grub/fonts/unicode.pf2" ]; then
+                mkdir -p /boot/grub/fonts
+                ln /boot/grub/unicode.pf2 /boot/grub/fonts/unicode.pf2
+            fi
+
             grub2cfg="/boot/grub/grub.cfg"
             [ ! -f "${grub2cfg}" ] ||
                sed -i -e "s,root=/dev/[hs]da1,root=LABEL=writable," "${grub2cfg}"