From 049339e168305a580d2167510cd16f524f11a11d34fe125750d9eac36b919da2 Mon Sep 17 00:00:00 2001
From: OBS User autobuild <null@suse.de>
Date: Wed, 24 Feb 2010 01:10:49 +0000
Subject: [PATCH] Accepting request 32965 from Base:System

Copy from Base:System/kbd based on submit request 32965 from user anicka

OBS-URL: https://build.opensuse.org/request/show/32965
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kbd?expand=0&rev=35
---
 kbd.changes |  5 +++++
 kbd.init    | 13 ++++---------
 kbd.spec    |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/kbd.changes b/kbd.changes
index acc9bb0..94bd737 100644
--- a/kbd.changes
+++ b/kbd.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Feb 19 14:39:29 CET 2010 - anicka@suse.cz
+
+- respect KBD_TTY="" set in sysconfig (bnc#405658)
+
 -------------------------------------------------------------------
 Tue Feb 16 11:14:18 PST 2010 - vuntz@opensuse.org
 
diff --git a/kbd.init b/kbd.init
index e762ebf..c72d652 100644
--- a/kbd.init
+++ b/kbd.init
@@ -80,23 +80,18 @@ fi
 
 #
 # Calculate KBD_TTY array only once
-# Caution: Keep in sync with earlykbd.init
 #
 
-# >=tty7 left out intentionaly (Bug #302010)
-KBD_TTY_DEFAULT="tty1 tty2 tty3 tty4 tty5 tty6"
+KBD_TTY_DEFAULT="${KBD_TTY:-tty1 tty2 tty3 tty4 tty5 tty6}"
 
 newkbd=""
 for tty in $KBD_TTY_DEFAULT; do
+    # >=tty7 left out intentionaly (Bug #302010)
+    test ${tty#tty} -ge 7 2>/dev/null && continue
     test -w /dev/$tty		|| continue
     test -c /dev/$tty		|| continue
     > /dev/$tty &> /dev/null	|| continue
-    # consider settings in /etc/sysconfig/keyboard:KBD_TTY
-    test -z "$KBD_TTY"          && continue
-    case ":${KBD_TTY// /:}:" in
-    *:$tty:*)
-	newkbd="${newkbd:+$newkbd }/dev/$tty"
-    esac
+    newkbd="${newkbd:+$newkbd }/dev/$tty"
 done
 KBD_TTY="$newkbd"
 unset newkbd
diff --git a/kbd.spec b/kbd.spec
index 74c618f..fbfcbd5 100644
--- a/kbd.spec
+++ b/kbd.spec
@@ -24,7 +24,7 @@ License:        GPLv2+
 Group:          System/Console
 AutoReqProv:    on
 Version:        1.14.1
-Release:        23
+Release:        24
 Summary:        Keyboard and Font Utilities
 Source:         kbd-%{version}.tar.bz2
 Source1:        kbd_fonts.tar.bz2