From 6a2b249579f8a83592bef4ddff2f749f021569a2 Mon Sep 17 00:00:00 2001
From: Tobias Powalowski <tpowa@archlinux.org>
Date: Thu, 26 Jan 2023 19:54:56 +0100
Subject: [PATCH] add Terminus to FONT selector menu.

---
 CHANGELOG              |  6 +++---
 usr/bin/archboot-km.sh | 11 ++++++++---
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 628e39500..9453c874e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -7,7 +7,7 @@ Highlights:
 Environment changes:
 - show full initrd line in grub menu
 - added fbset and terminus-font
-- removed zsh and grml-zsh-config
+- removed pcre, zsh and grml-zsh-config
 - use color for bash prompt and ls output
 update-installer:
 - added network check
@@ -15,7 +15,7 @@ setup:
 - major cleanup of blockdevice code
 - major cleanup of mountpoints code
 - outsourced help texts to files
-- added new help texts for partitioning GUID and BIOS/MBR
+- added new help texts for partitioning GUID/GPT and BIOS/MBR
 - new systemd compliant mounting dialogs with /efi or /boot as ESP
 - don't format already existing ESP
 - don't format already existing swap partition
@@ -25,7 +25,7 @@ setup:
 - new efibootmgr routine
 - disable unsafe menu entries on installed system
 - don't show install message on installed system
-- added new menu title if running on installed system
+- added new menu title, if running on installed system
 - fixed automounted ESP and /boot detection on installed systems
 - don't ask for network, sources and mkfs on installed sytems
 - fix LANG= add .UTF-8 to parameter
diff --git a/usr/bin/archboot-km.sh b/usr/bin/archboot-km.sh
index 7a89f6b57..e40f01fbc 100755
--- a/usr/bin/archboot-km.sh
+++ b/usr/bin/archboot-km.sh
@@ -40,11 +40,16 @@ _do_vconsole() {
 
 _set_vconsole() {
     if grep -qw 'sun32' /etc/vconsole.conf; then
-        _dialog --infobox "Detected big screen size, using 32 font size now..." 3 60
-        _FONT="latarcyrheb-sun32"
+        _FONTS="latarcyrheb-sun32 Worldwide ter-v32n Terminus"
+        _CANCEL=
+        #shellcheck disable=SC2086
+        _dialog --menu "\n        Select Console Font:\n\n     Font Name          Region" 12 40 14 ${_FONTS} 2>${_ANSWER} || _CANCEL=1
+        _abort_dialog || return 1
+        #shellcheck disable=SC2086
+        _FONT=$(cat ${_ANSWER})
         sleep 2
     else
-        _FONTS="latarcyrheb-sun16 Worldwide eurlatgr Europe"
+        _FONTS="latarcyrheb-sun16 Worldwide eurlatgr Europe ter-v16n Terminus"
         _CANCEL=
         #shellcheck disable=SC2086
         _dialog --menu "\n        Select Console Font:\n\n     Font Name          Region" 12 40 14 ${_FONTS} 2>${_ANSWER} || _CANCEL=1