From: Michael Prokop <mika@grml.org>
Date: Fri, 16 Nov 2007 07:46:50 +0000 (+0100)
Subject: switch to the original tty when running consolechars
X-Git-Tag: 0.7.30
X-Git-Url: https://git.grml.org/?p=grml-autoconfig.git;a=commitdiff_plain;h=c4ac9b268397ed40c13f6b22df8d2a773e946b8e

switch to the original tty when running consolechars
---

diff --git a/autoconfig.functions b/autoconfig.functions
index b3529ce..cfd8366 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: Don Nov 15 22:01:50 CET 2007 [mika]
+# Latest change: Fre Nov 16 08:45:53 CET 2007 [mika]
 ################################################################################
 
 # {{{ path, variables, signals, umask, zsh
@@ -283,15 +283,17 @@ config_language(){
  fi
 
  # we have to set up all consoles, therefore loop it over all ttys:
- NUM_CONSOLES=`fgconsole --next-available`
- NUM_CONSOLES=`expr ${NUM_CONSOLES} - 1`
+ NUM_CONSOLES=$(fgconsole --next-available)
+ NUM_CONSOLES=$(expr ${NUM_CONSOLES} - 1)
  [ ${NUM_CONSOLES} -eq 1 ] && NUM_CONSOLES=6
+ CUR_CONSOLE=$(fgconsole)
 
  if [ -n "$CHARMAP" ] ; then
     einfo "Running consolechars for ${CHARMAP}"
     for vc in `seq 0 ${NUM_CONSOLES}`  ; do
         consolechars --tty=/dev/tty${vc} -m ${CHARMAP} ; RC=$?
     done
+    [ -n "$CUR_CONSOLE" ] && chvt $CUR_CONSOLE
     eend $RC
  fi
 
@@ -303,6 +305,7 @@ config_language(){
        for vc in `seq 0 ${NUM_CONSOLES}`  ; do
            consolechars --tty=/dev/tty${vc} -f $CONSOLEFONT ; RC=$?
        done
+       [ -n "$CUR_CONSOLE" ] && chvt $CUR_CONSOLE
        eend $?
     fi
  fi
diff --git a/debian/changelog b/debian/changelog
index 2d3bc3c..6cd6abb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+grml-autoconfig (0.7.30) unstable; urgency=low
+
+  * Make sure to switch to the original tty when running
+    consolechars. There seems to be a strange race condition
+    inside consolechars.
+
+ -- Michael Prokop <mika@grml.org>  Fri, 16 Nov 2007 08:46:02 +0100
+
 grml-autoconfig (0.7.29) unstable; urgency=low
 
   * New bootoption micvol (usage: micvol=$number) for setting mixer/