- after doing our job switch to last used terminal instead of tty1

Changed files:
    fbset.init -> 1.25

diff --git a/fbset.init b/fbset.init
index 71987ec6a806329c0fe32e26f43ad09e20731362..0c704c5eb9ebe6dc846b3e123ddad2fbdea715d8 100644 (file)
--- a/fbset.init
+++ b/fbset.init
@@ -62,14 +62,19 @@ case "$1" in
                                          "`ls /dev/vc/* | sed 's|/dev/vc/||g'`"
                                fi
                                FBDEV=`echo /dev/fb/${FBDEV_NUM}`
+                               pattern="s/\/dev\/vc\///g"
                        else
                                if [ -z "$FBTERMINALS" ]; then
                                        FBTERMINALS=\
                                          "`cat /etc/inittab | grep '^[0-9]*:' | cut -f1 -d:`"
                                fi
                                FBDEV=`echo /dev/fb${FBDEV_NUM}`
+                               pattern="s/\/dev\/tty//g"
                        fi
 
+                       # save old tty number
+                       tty=`/usr/bin/tty | sed $pattern`
+
                        for cons in $FBTERMINALS; do
                                /usr/bin/con2fb $FBDEV $cons
                                /usr/bin/switchto $cons
@@ -77,7 +82,8 @@ case "$1" in
                                  $FBDEV ${DEPTH_options} $FBMODE_default \
                                  0<>/dev/tty$cons >&0 2>&0
                        done
-                       /usr/bin/switchto 1
+                       [ $tty = "/dev/console" ] && tty=1
+                       /usr/bin/switchto $tty
                        ok
                fi
                touch /var/lock/subsys/fbset