Load configured font and do it early.

diff --git a/geninitrd b/geninitrd
index 24780639757ec73202bf149712c94e83c57106bc..f31f00dbc28e17952833427ba442766e86a2f8f9 100755 (executable)
--- a/geninitrd
+++ b/geninitrd
@@ -202,6 +202,25 @@ mount_dev() {
        EOF
 }
 
+# load font
+load_font() {
+       local font
+       [ ! -r /etc/sysconfig/console ] && return
+       . /etc/sysconfig/console
+       if [ -n "$CONSOLEFONT" ]; then
+               font=$(ls -1 /lib/kbd/consolefonts/${CONSOLEFONT}*.gz 2> /dev/null)
+               if [ -n "$font" ]; then
+                       verbose "Loading font $font"
+                       busybox_applet loadfont
+                       inst_d "/lib/kbd/consolefonts"
+                       cp -a "$font" "$DESTDIR/lib/kbd/consolefonts/"
+                       gunzip ${DESTDIR}/lib/kbd/consolefonts/${CONSOLEFONT}*.gz
+                       font=${font%.gz}
+                       echo "loadfont < $font" | add_linuxrc
+               fi
+       fi
+}
+
 # generate code to mount /proc on initrd
 # can be called multiple times
 mount_proc() {
@@ -1478,6 +1497,7 @@ add_linuxrc <<EOF
 # on $(LC_ALL=C date)
 
 EOF
+load_font
 mount_proc
 
 kmsg "geninitrd/$VERSION starting"