From 478b91b9fdddc8093df60d6c858d80386f5e56f109652c901f4c31bde6ea118a Mon Sep 17 00:00:00 2001
From: OBS User unknown <null@suse.de>
Date: Mon, 5 May 2008 23:30:27 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/openSUSE:Factory/kbd?expand=0&rev=15

---
 kbd.changes |  5 +++++
 kbd.init    | 33 ++++++++++++++++++++++++++++++++-
 kbd.spec    |  5 ++++-
 3 files changed, 41 insertions(+), 2 deletions(-)

diff --git a/kbd.changes b/kbd.changes
index dd2d269..df8c70a 100644
--- a/kbd.changes
+++ b/kbd.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon May  5 17:21:42 CEST 2008 - jw@suse.de
+
+- added fix for bnc#164378 from werner.
+
 -------------------------------------------------------------------
 Fri Apr 25 12:11:45 CEST 2008 - jw@suse.de
 
diff --git a/kbd.init b/kbd.init
index 4cbedb1..00cd5ba 100644
--- a/kbd.init
+++ b/kbd.init
@@ -379,6 +379,30 @@ case "$1" in
 		# do not mess up console
 		unset CONSOLE_FONT
 	fi
+
+	## bnc#164378
+	if test "$CONSOLE_FONT" = "default"; then
+	    if test -z "$CONSOLE_FONT_HEIGHT" -o "$CONSOLE_FONT_HEIGHT" = "auto" ; then
+		if test -x /sbin/fbset && /sbin/fbset -s > /dev/null 2>&1 ; then
+		    CONSOLE_FONT_HEIGHT=16
+		else
+		    for tty in $KBD_TTY; do
+			# Showconsolefont tries to open a device
+			test "${tty##*/}" = "${tty}" && tty=/dev/$tty
+			vidmode=$(/bin/showconsolefont -i < $tty 2> /dev/null)
+			break
+		    done
+		    if test -z "$vidmode" ; then
+			CONSOLE_FONT_HEIGHT=8
+		    else
+			vidmode=${vidmode#*x}
+			vidmode=${vidmode%x*}
+			CONSOLE_FONT_HEIGHT=$vidmode
+		    fi
+		    unset vidmode
+		fi
+	    fi
+	fi
 	# setfont
 	if test -d ${KBDBASE}/consolefonts -a \
 		-n "$CONSOLE_FONT" -a "$CONSOLE_FONT" != "YAST_ASK"
@@ -412,7 +436,14 @@ case "$1" in
 		    # The chvt is not needed for SuSE kernels
 		    test "$NON_SUSE_KERNEL" != "yes" || chvt ${tty#*tty}
 
-		    /bin/setfont -C $tty $CONSOLE_FONT $UMAP $SMAP
+		    # Setfont tries to open a device
+		    test "${tty##*/}" = "${tty}" && tty=/dev/$tty
+
+		    if test "$CONSOLE_FONT" = "default" ; then
+			/bin/setfont -C $tty -$CONSOLE_FONT_HEIGHT $UMAP $SMAP
+		    else
+			/bin/setfont -C $tty $CONSOLE_FONT $UMAP $SMAP
+		    fi
 		    rc_status
 
 		    echo -en "$CONSOLE_MAGIC" > $tty
diff --git a/kbd.spec b/kbd.spec
index 7d37e20..6a9f406 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:        173
+Release:        176
 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
@@ -62,6 +62,7 @@ Patch28:        bnc147581_jp106.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 PreReq:         %fillup_prereq %insserv_prereq
 BuildRequires:  bison flex
+Recommends:     fbset
 
 %description
 Load and save keyboard mappings. This is needed if you are not using
@@ -326,6 +327,8 @@ rm -rf $RPM_BUILD_ROOT
 #rm -rf $RPM_BUILD_DIR/kbd-%{version}
 
 %changelog
+* Mon May 05 2008 jw@suse.de
+- added fix for bnc#164378 from werner.
 * Fri Apr 25 2008 jw@suse.de
 - experimental patch for bnc#147581 added.
 * Fri Mar 21 2008 sndirsch@suse.de