Bug#188033: kbd-chooser: keymap list should be sorted
Package: kbd-chooser
Version: 0.017
Severity: wishlist
Tags: patch, pending
When selecting ps2 and no-latin1 in kbd-chooser, an incorrect KBD
value is passed to base-config. I find the following line in
/root/dbootstrap_settings:
KBD="i386/qwerty/no-latin1.kmap"
The '.kmap' at the end should not be there.
The following patch fixes the problem. It is already commited to CVS.
Index: debian/changelog
===================================================================
RCS file: /cvs/debian-boot/debian-installer/tools/kbd-chooser/debian/changelog,vretrieving revision 1.27
retrieving revision 1.28
diff -u -3 -p -u -r1.27 -r1.28
--- debian/changelog 25 Mar 2003 07:18:36 -0000 1.27
+++ debian/changelog 31 Mar 2003 17:35:44 -0000 1.28
@@ -1,3 +1,11 @@
+kbd-chooser (0.018) UNRELEASED; urgency=low
+
+ * Petter Reinholdtsen
+ - Strip '.kmap' as well as '.kmap.gz' from keymap path name
+ when passing it to base-config.
+
+ -- Petter Reinholdtsen <pere@debian.org> Mon, 31 Mar 2003 20:34:31 +0300
+
kbd-chooser (0.017) unstable; urgency=low
* Petter Reinholdtsen
Index: debian/prebaseconfig
===================================================================
RCS file: /cvs/debian-boot/debian-installer/tools/kbd-chooser/debian/prebaseconfig,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -p -u -r1.7 -r1.8
--- debian/prebaseconfig 21 Mar 2003 13:21:49 -0000 1.7
+++ debian/prebaseconfig 31 Mar 2003 17:35:44 -0000 1.8
@@ -28,9 +28,8 @@ if [ ! -d /target/root ] ; then
fi
# Map no-latin1 to i386/qwerty/no-latin1
-KBD=`find /usr/share/keymaps/ -name "$KEYMAP.kmap*" | sed 's%/usr/share/keymaps/%%' | sed 's/.kmap.gz$//' `
+KBD=`find /usr/share/keymaps/ -name "$KEYMAP.kmap*" | sed -e 's%/usr/share/keymaps/%%' -e 's/.kmap.gz$//' -e 's/.kmap$//' `
(
echo "# Inserted by kbd-chooser."
echo "KBD=\"$KBD\""
) >> /target/root/dbootstrap_settings
-
Reply to: