From 311d866b416f713c29e3b6a6763b410eabe88cd3 Mon Sep 17 00:00:00 2001
From: Tobias Powalowski <tpowa@archlinux.org>
Date: Thu, 26 Jan 2023 20:07:25 +0100
Subject: [PATCH] change default font to terminus-font ter-v16n or ter-v32n

---
 usr/lib/archboot/installer/common.sh      | 1 +
 usr/lib/archboot/login.sh                 | 2 +-
 usr/share/archboot/base/etc/vconsole.conf | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/usr/lib/archboot/installer/common.sh b/usr/lib/archboot/installer/common.sh
index d0d6cd7af..a2f7ba131 100644
--- a/usr/lib/archboot/installer/common.sh
+++ b/usr/lib/archboot/installer/common.sh
@@ -114,6 +114,7 @@ _auto_packages() {
     if ls /sys/class/net | grep -q wlan; then
         ! echo "${_PACKAGES}" | grep -qw iwd && _PACKAGES="${_PACKAGES} iwd"
     fi
+    grep -q '^FONT=ter' /etc/vconsole.conf && _PACKAGES="${_PACKAGES} terminus-font"
     # only add firmware if already used
     _linux_firmware
     _marvell_firmware
diff --git a/usr/lib/archboot/login.sh b/usr/lib/archboot/login.sh
index 51e0135a5..0f5dc537f 100644
--- a/usr/lib/archboot/login.sh
+++ b/usr/lib/archboot/login.sh
@@ -11,7 +11,7 @@ _vconsole() {
             SIZE="16"
         fi
         echo KEYMAP=us > /etc/vconsole.conf
-        echo FONT=latarcyrheb-sun${SIZE} >> /etc/vconsole.conf
+        echo FONT=ter-v${SIZE}n >> /etc/vconsole.conf
         systemctl restart systemd-vconsole-setup
     fi
 }
diff --git a/usr/share/archboot/base/etc/vconsole.conf b/usr/share/archboot/base/etc/vconsole.conf
index 4eff1d3f3..7dd4344b1 100644
--- a/usr/share/archboot/base/etc/vconsole.conf
+++ b/usr/share/archboot/base/etc/vconsole.conf
@@ -1,2 +1,2 @@
 KEYMAP=us
-FONT=latarcyrheb-sun16
+FONT=ter-v16n