From 7319269ca791938310dded6ff8a806f2426b94e7 Mon Sep 17 00:00:00 2001
From: Thomas Bächler <thomas@archlinux.org>
Date: Sat, 8 May 2010 14:05:19 +0200
Subject: Allow usage of non-utf8 fonts in the consolefont hook, see FS#19109

Patch was provided by Mark (voidzero) in https://bugs.archlinux.org/task/19109
This requires busybox commit http://git.busybox.net/busybox/commit/?id=8ce1dc03c1b2b61e51527b987579c09c991cc4b2
which is in the 1.7 branch, a backport will be included in an updated mkinitcpio-busybox package
---
 install/consolefont | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'install')

diff --git a/install/consolefont b/install/consolefont
index 789a661..7a3e73f 100644
--- a/install/consolefont
+++ b/install/consolefont
@@ -8,14 +8,18 @@ install ()
     SCRIPT="consolefont"
     eval "$(grep -e "^CONSOLEFONT=" /etc/rc.conf)"
     if [ -n "$CONSOLEFONT" ]; then
-        CONSOLEFONT_FILE_GZ="/usr/share/kbd/consolefonts/$CONSOLEFONT.psfu.gz"
-        if [ -e ${CONSOLEFONT_FILE_GZ} ]; then
+        if [ -e /usr/share/kbd/consolefonts/$CONSOLEFONT.psfu.gz ]; then
+            CONSOLEFONT_FILE_GZ="/usr/share/kbd/consolefonts/$CONSOLEFONT.psfu.gz"
             CONSOLEFONT_FILE="$(mktemp ${TMPDIR}/consolefont.psfu.XXXXXX)"
             zcat ${CONSOLEFONT_FILE_GZ} > ${CONSOLEFONT_FILE}
             add_file ${CONSOLEFONT_FILE} /consolefont.psfu
+        elif [ -e /usr/share/kbd/consolefonts/$CONSOLEFONT.psf.gz ]; then
+            CONSOLEFONT_FILE_GZ="/usr/share/kbd/consolefonts/$CONSOLEFONT.psf.gz"
+            CONSOLEFONT_FILE="$(mktemp ${TMPDIR}/consolefont.psf.XXXXXX)"
+            zcat ${CONSOLEFONT_FILE_GZ} > ${CONSOLEFONT_FILE}
+            add_file ${CONSOLEFONT_FILE} /consolefont.psf
         else
-            echo "consolefont: Font file does not exist or does not end with .psfu.gz"
-            echo "consolefont: Only unicode fonts are supported at the moment."
+            echo "consolefont: Font file does not exist or does not end with .psf.gz or .psfu.gz."
         fi
     fi
 }
-- 
cgit v1.2.3-24-g4f1b