Hello community, here is the log from the commit of package kbd checked in at Tue May 6 01:30:27 CEST 2008. -------- --- kbd/kbd.changes 2008-04-25 12:12:09.000000000 +0200 +++ /mounts/work_src_done/STABLE/kbd/kbd.changes 2008-05-05 21:15:02.325897000 +0200 @@ -1,0 +2,5 @@ +Mon May 5 17:21:42 CEST 2008 - jw@suse.de + +- added fix for bnc#164378 from werner. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kbd.spec ++++++ --- /var/tmp/diff_new_pack.N27107/_old 2008-05-06 01:29:32.000000000 +0200 +++ /var/tmp/diff_new_pack.N27107/_new 2008-05-06 01:29:32.000000000 +0200 @@ -17,7 +17,7 @@ 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 @@ 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_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 ++++++ kbd.init ++++++ --- kbd/kbd.init 2008-03-21 18:29:43.000000000 +0100 +++ /mounts/work_src_done/STABLE/kbd/kbd.init 2008-05-05 21:15:16.890312000 +0200 @@ -379,6 +379,30 @@ # 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 @@ # 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 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org