From: Michael Prokop <mika@grml.org>
Date: Thu, 15 Nov 2007 10:48:52 +0000 (+0100)
Subject: Add bootoption noconsolefont
X-Git-Tag: 0.7.28
X-Git-Url: http://git.grml.org/?p=grml-autoconfig.git;a=commitdiff_plain;h=c30eeec5fbd41ff16333f73c96f2cc39d5d6c0c7

Add bootoption noconsolefont
---

diff --git a/autoconfig.functions b/autoconfig.functions
index 96c1703..dc446e4 100755
--- a/autoconfig.functions
+++ b/autoconfig.functions
@@ -295,12 +295,16 @@ config_language(){
     eend $RC
  fi
 
- if [ -n "$CONSOLEFONT" ] ; then
-    einfo "Running consolechars using ${CONSOLEFONT}"
-    for vc in `seq 0 ${NUM_CONSOLES}`  ; do
-        consolechars --tty=/dev/tty${vc} -f $CONSOLEFONT ; RC=$?
-    done
-    eend $?
+ if checkbootparam noconsolefont ; then
+    ewarn "Skipping setting console font as requested on boot commandline." ; eend 0
+ else
+    if [ -n "$CONSOLEFONT" ] ; then
+       einfo "Running consolechars using ${CONSOLEFONT}"
+       for vc in `seq 0 ${NUM_CONSOLES}`  ; do
+           consolechars --tty=/dev/tty${vc} -f $CONSOLEFONT ; RC=$?
+       done
+       eend $?
+    fi
  fi
 
  eoutdent
diff --git a/debian/changelog b/debian/changelog
index b90d2a0..496ead5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ grml-autoconfig (0.7.28) unstable; urgency=low
   * Drop the 'consolechars --tty=/dev/tty${vc} -d' stuff from
     config_language, otherwise we will find ourself at tty5 under
     certain circumstances.
+  * Add bootoption noconsolefont to skip setting console font via
+    consolechars.
 
  -- Michael Prokop <mika@grml.org>  Thu, 15 Nov 2007 11:46:15 +0100