From 61ddbb9a073a717181a7e35ea1104f4f9214e52c Mon Sep 17 00:00:00 2001
From: Tobias Powalowski <tpowa@archlinux.org>
Date: Thu, 9 Feb 2023 15:16:11 +0100
Subject: [PATCH] fix Terminus font from the beginning

---
 usr/lib/initcpio/install/archboot_init |  2 +-
 usr/share/archboot/base/init           | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/usr/lib/initcpio/install/archboot_init b/usr/lib/initcpio/install/archboot_init
index 93620579b..9a46ee401 100644
--- a/usr/lib/initcpio/install/archboot_init
+++ b/usr/lib/initcpio/install/archboot_init
@@ -29,7 +29,7 @@ build() {
     done
     map add_binary blkid mount switch_root bsdcpio mkfs.btrfs setfont \
         /usr/lib/systemd/systemd-udevd udevadm systemd-tmpfiles
-    add_file "/usr/share/kbd/consolefonts/ter-v16n.psf.gz"
+    add_file "/usr/share/kbd/consolefonts/ter-v16n.psf.gz" "/consolefont.psf.gz"
     map add_udev_rule '50-udev-default.rules' '60-persistent-storage.rules' \
         '64-btrfs.rules' '80-drivers.rules'
 
diff --git a/usr/share/archboot/base/init b/usr/share/archboot/base/init
index 36d75b09a..c8894bb3c 100755
--- a/usr/share/archboot/base/init
+++ b/usr/share/archboot/base/init
@@ -11,24 +11,24 @@ if [ -e /sys/firmware/efi ]; then
 fi
 kmod static-nodes --format=tmpfiles --output=/run/tmpfiles.d/kmod.conf
 systemd-tmpfiles --prefix=/dev --create --boot
-setfont -C /dev/console ter-v16n
-echo "Initializing Archboot Environment:"
-echo "Step 1/3: Initializing udev..."
 /usr/lib/systemd/systemd-udevd --daemon --resolve-names=never &>/dev/null
 udevadm trigger --action=add --type=subsystems
 udevadm trigger --action=add --type=devices
 udevadm settle
 udevadm control --exit
 udevadm info --cleanup-db
-echo "Step 2/3: Initializing /dev/zram0..."
+echo -e "\e[1mInitializing\e[m \e[36mArchboot\e[m \e[1m- Arch Linux Environment:\e[m"
+setfont consolefont.psf.gz -C /dev/console
+echo -e "\e[1mStep 1/3:\e[m Initializing /dev/zram0..."
 modprobe zram
 echo "zstd" >/sys/block/zram0/comp_algorithm
 echo "4G" > /sys/block/zram0/disksize
+echo -e "\e[1mStep 2/3:\e[m Initializing btrfs on /dev/zram0..."
 mkfs.btrfs /dev/zram0 &>/dev/null
 mount /dev/zram0 /new_root &>/dev/null
 mount UUID=1234-ABCD /mnt
 cd new_root
-echo "Step 3/3: Initializing /new_root..."
+echo -e "\e[1mStep 3/3:\e[m Initializing /new_root..."
 bsdcpio -i </mnt/boot/initramfs-$(uname -m).img  &>/dev/null
 exec switch_root /new_root /init "$@"