- updated to 2.6.4

[packages/kbd.git] / kbd.init

diff --git a/kbd.init b/kbd.init
index afbd96dc15c7e1b3e197444bf80f5c0d75e1edaf..00c15f8c20d83ed589c95a74556bafb426b150ce 100644 (file)
--- a/kbd.init
+++ b/kbd.init
@@ -23,8 +23,6 @@ if is_yes "$VSERVER"; then
        exit 0
 fi
 
-upstart_controlled
-
 [ -f /etc/sysconfig/i18n ] && . /etc/sysconfig/i18n
 . /etc/sysconfig/console
 
@@ -48,9 +46,10 @@ start() {
        fi
        # save old tty number
        tty=$(/usr/bin/tty)
-       tty=${tty#$devpath}
-       if [ "$tty" = "/dev/console" ]; then
+       if [ "$?" -ne 0 -o "$tty" = "/dev/console" ]; then
                tty=1
+       else
+               tty=${tty#$devpath}
        fi
 
        if [ -n "$CONSOLEFONT" -a -x /sbin/setsysfont ]; then