From 287051ff15ee16989ed9ab38b8a73e0c98504a7a Mon Sep 17 00:00:00 2001
From: Michael Prokop <mika@grml.org>
Date: Thu, 15 Nov 2007 11:47:30 +0100
Subject: [PATCH] Drop the 'consolechars --tty=/dev/tty -d' stuff

---
 autoconfig.functions | 6 ++++--
 debian/changelog     | 8 ++++++++
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/autoconfig.functions b/autoconfig.functions
index f7d2af3..96c1703 100755
--- a/autoconfig.functions
+++ b/autoconfig.functions
@@ -4,7 +4,7 @@
 # Authors:       grml-team (grml.org), (c) Klaus Knopper <knopper@knopper.net>, (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2.
-# Latest change: Son Sep 30 14:15:11 CEST 2007 [mika]
+# Latest change: Don Nov 15 11:46:04 CET 2007 [mika]
 ################################################################################
 
 # {{{ path, variables, signals, umask, zsh
@@ -286,6 +286,7 @@ config_language(){
  NUM_CONSOLES=`fgconsole --next-available`
  NUM_CONSOLES=`expr ${NUM_CONSOLES} - 1`
  [ ${NUM_CONSOLES} -eq 1 ] && NUM_CONSOLES=6
+
  if [ -n "$CHARMAP" ] ; then
     einfo "Running consolechars for ${CHARMAP}"
     for vc in `seq 0 ${NUM_CONSOLES}`  ; do
@@ -293,10 +294,11 @@ config_language(){
     done
     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 || consolechars --tty=/dev/tty${vc} -d
+        consolechars --tty=/dev/tty${vc} -f $CONSOLEFONT ; RC=$?
     done
     eend $?
  fi
diff --git a/debian/changelog b/debian/changelog
index e9b2e12..b90d2a0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+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.
+
+ -- Michael Prokop <mika@grml.org>  Thu, 15 Nov 2007 11:46:15 +0100
+
 grml-autoconfig (0.7.27) unstable; urgency=low
 
   * Ignore /dev/.static/dev for /etc/mtab in live-mode.
-- 
2.1.4