From: Ulrich Dangel <uli@spamt.net>
Date: Sat, 24 Oct 2009 17:40:30 +0000 (+0200)
Subject: Load Lat15-Terminus16 console font if no framebuffer is available.
X-Git-Tag: v0.8.40~2
X-Git-Url: https://git.grml.org/?p=grml-autoconfig.git;a=commitdiff_plain;h=5c9ab08c71883fede481148556efe2c316c58c28;ds=sidebyside

Load Lat15-Terminus16 console font if no framebuffer is available.

Only load Uni3-Terminus font if framebuffer is present due to restrictions
in VGA mode to prevent strange characters in console. Thanks to Thorsten
Glaser for his hint. [Closes: issue318]
---

diff --git a/autoconfig.functions b/autoconfig.functions
index 5519f28..75060f8 100755
--- a/autoconfig.functions
+++ b/autoconfig.functions
@@ -78,6 +78,11 @@ checkbootparam(){
   esac
 }
 
+# Check if currently using a framebuffer
+hasfb() {
+    [ -e /dev/fb0 ] && return 0 || return 1
+}
+
 # Check wheter a configuration variable (like $CONFIG_TOHD) is
 # enabled or not
 checkvalue(){
@@ -236,6 +241,9 @@ config_language(){
        else
           ewarn "/usr/share/consolefonts/Uni3-Terminus16.psf.gz not available. Please upgrade package console-terminus." ; eend 1
        fi
+       if ! hasfb ; then
+          CONSOLEFONT='Lat15-Terminus16'
+       fi
     fi
  fi