From 7aa89438d6660f22fdf9b2d5c86cc2fa5362e1fb729bea27917fce8d6bc42664 Mon Sep 17 00:00:00 2001
From: OBS User unknown <null@suse.de>
Date: Wed, 26 Mar 2008 15:16:40 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/openSUSE:Factory/kbd?expand=0&rev=13

---
 kbd.changes |  5 +++++
 kbd.init    | 13 ++++++++-----
 kbd.spec    |  4 +++-
 3 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/kbd.changes b/kbd.changes
index 2cf3517..f2b1614 100644
--- a/kbd.changes
+++ b/kbd.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Mar 21 18:47:50 CET 2008 - sndirsch@suse.de
+
+- kbd.init: MAY_TTY should be tty6 (Bug #302010) 
+
 -------------------------------------------------------------------
 Thu Feb 21 21:19:52 CET 2008 - crrodriguez@suse.de
 
diff --git a/kbd.init b/kbd.init
index 89f9582..4cbedb1 100644
--- a/kbd.init
+++ b/kbd.init
@@ -85,16 +85,19 @@ fi
 # Calculate KBD_TTY array only once
 # Caution: Keep in sync with earlykbd.init
 #
-if test -z "$KBD_TTY"; then
-        # >=tty7 left out intentionaly
-	KBD_TTY="tty1 tty2 tty3 tty4 tty5 tty6"
-fi
+
+# >=tty7 left out intentionaly (Bug #302010)
+KBD_TTY_DEFAULT="tty1 tty2 tty3 tty4 tty5 tty6"
 
 newkbd=""
-for tty in $KBD_TTY; do
+for tty in $KBD_TTY_DEFAULT; do
     test -w /dev/$tty		|| continue
     test -c /dev/$tty		|| continue
     > /dev/$tty &> /dev/null	|| continue
+    # consider settings in /etc/sysconfig/keyboard:KBD_TTY
+    if test -n "$KBD_TTY"; then
+	echo "$KBD_TTY" | grep -q $tty || continue
+    fi
     newkbd="${newkbd:+$newkbd }/dev/$tty"
 done
 KBD_TTY="$newkbd"
diff --git a/kbd.spec b/kbd.spec
index 088aadc..facea9e 100644
--- a/kbd.spec
+++ b/kbd.spec
@@ -17,7 +17,7 @@ License:        GPL v2 or later
 Group:          System/Console
 AutoReqProv:    on
 Version:        1.12
-Release:        163
+Release:        166
 Summary:        Keyboard and Font Utilities
 Source:         ftp://ftp.win.tue.nl/pub/home/aeb/linux-local/utils/kbd/%{name}-%{version}.tar.bz2
 Source1:        kbd_fonts.tar.bz2
@@ -324,6 +324,8 @@ rm -rf $RPM_BUILD_ROOT
 #rm -rf $RPM_BUILD_DIR/kbd-%{version}
 
 %changelog
+* Fri Mar 21 2008 sndirsch@suse.de
+- kbd.init: MAY_TTY should be tty6 (Bug #302010)
 * Thu Feb 21 2008 crrodriguez@suse.de
 - use find_lang macro
 * Mon Dec 03 2007 jw@suse.de