[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#276752: Urgent patch for kbd-chooser



Denis, thanks again for your valuable reviews.

* Denis Barbier [2004-10-18 20:53:12+0200]
> On Mon, Oct 18, 2004 at 08:48:57PM +0300, Recai Oktas wrote:
> [...]
> > * The workaround I proposed should not affect the languages using
> >   iso-8859-1/15 and utf-8, because this workaround means to return
> >   temporarily back to the old behaviour (the one before applying the
> >   patch to fix the keyboard freezes).  Nevertheless we should perform a
> >   test.  Hence I CC'ed this mail to Christian (iso-8859-1/15) and
> >   Konstantinos (utf-8).  Could you check the French and Greek keyboards
> >   _after the installation_ by first applying the patch attached to the
> >   /usr/lib/prebaseconfig.d/70kbd-chooser in d-i phase?
> 
> Recai, the question is not to have a simple fix, but to make sure things
> are not broken.  I agree that your patch does the right thing (except
> for UTF-8, I believe that it should not be applied then but did not make
> tests), but it is too invasive.  

Well, my (not so clear) point with the brute-force change was not
simplicity.  Instead, my intention was to prevent the regression
happened after adding the unicode switching code in d-i as part of the
fix for "keyboard freezes" bug.

> Your initial patch looked much less dangerous, it had to be extended
> to few other countries, and that's all.

I've revised my patch.  Problematic keymap names were collected from
'console-data/debian/udeb/console-keymaps-at'.  I've tested it for
Turkish and Hebrew.  Turkish keyboard worked well.  Hebrew keymap was
loaded without any error.  The other keymaps should also work.

Regards,

-- 
roktas
diff -ru kbd-chooser.orig/debian/prebaseconfig kbd-chooser/debian/prebaseconfig
--- kbd-chooser.orig/debian/prebaseconfig	2004-04-19 05:13:49.000000000 +0300
+++ kbd-chooser/debian/prebaseconfig	2004-10-18 23:04:09.000000000 +0300
@@ -10,6 +10,14 @@
 	exit 0
 fi
 
+# FIXME Workaround to install some keymaps properly
+case "$KEYMAP" in
+	trqu|trfu|hebrew|lt|lv-latin4)
+		kbd_mode_temp="ascii" ;;
+	*)
+		kbd_mode_temp=""      ;;
+esac
+
 # Install non-Unicode variants of Turkish keymaps
 if [ "$KEYMAP" = "trqu" ]; then
 	KEYMAP="trq"
@@ -23,7 +31,9 @@
 db_get debian-installer/serial-console
 if [ "$RET" = "false" ] ; then
 	apt-install console-tools console-data console-common 
+	[ -n "$kbd_mode_temp" ] && kbd-mode --$kbd_mode_temp
 	chroot /target install-keymap $KEYMAP
+	[ -n "$kbd_mode_temp" ] && kbd-mode --unicode
 fi
 
 

Attachment: signature.asc
Description: Digital signature


Reply to: