mkimage: Move console-setup configuration to customize step

 - it's futile to use debconf (for console-setup but also in general)
 - with that modifying the configuration after the fact is needed

Fixes: b4dff490 ("mkimage: configure console-setup to not touch font")

mkimage.sh

@@ -434,9 +434,8 @@ set -- "$@" \
 	--essential-hook='echo tzdata tzdata/Areas select Europe | chroot "$1" debconf-set-selections' \
 	--essential-hook='echo tzdata tzdata/Zones/Europe select Berlin | chroot "$1" debconf-set-selections' \
 	--essential-hook='echo locales locales/default_environment_locale select en_US.UTF-8 | chroot "$1" debconf-set-selections' \
-	--essential-hook='echo locales locales/locales_to_be_generated multiselect en_US.UTF-8 UTF-8 | chroot "$1" debconf-set-selections' \
-	--essential-hook='echo console-setup console-setup/fontface47 select Do not change the boot/kernel font | chroot "$1" debconf-set-selections' \
-	--essential-hook='echo console-setup console-setup/fontsize string | chroot "$1" debconf-set-selections'
+	--essential-hook='echo locales locales/locales_to_be_generated multiselect en_US.UTF-8 UTF-8 | chroot "$1" debconf-set-selections'
+
 
 # set up motd
 set -- "$@" \
@@ -631,6 +630,13 @@ for SYSIMAGE in $SYSIMAGES; do
 	unset UBOOT_SHA1
 done
 "
+# Unset FONTFACE and FONTSIZE in console-setup settings. With that the default
+# kernel font is used. On the Pocket the font is set to a larger from u-boot
+# using a kernel parameter. Without this change console-setup resets the font
+# to a small size on the Pocket.
+set -- "$@" --customize-hook="
+sed -i -e 's/^FONTFACE=.*/FONTFACE=/' -e 's/^FONTSIZE=.*/FONTSIZE=/' \"\$rootdir/etc/default/console-setup\"
+"
 # make sure that nothing inside the chroot is accidentally owned by the user
 # running mmdebstrap (happens when using sync-in or copy-in hooks)
 if [ "$(id -u)" -ne 0 ]; then