--- Begin Message ---
Package: kbd-chooser
Version: 1.28
Severity: wishlist
Tags: patch
In order to make it possible for initramfs generators to support the
users keymap, it would be good if it's installed into the target system
before the initramfs image is generated.
The attached patch moves the finish-install.d script to
post-base-installer.d and changes it to install the console-* packages
at the same time. If the console is via serial or no keymap was chosen,
no packages are installed and no keymap generated (which should mimic
the old behaviour).
Regards,
David Härdeman
Index: debian/postinst
===================================================================
--- debian/postinst (revision 38567)
+++ debian/postinst (working copy)
@@ -6,9 +6,4 @@
kbd-chooser
-db_get debian-installer/serial-console
-if [ "$RET" = false ]; then
- apt-install console-tools console-data console-common || true
-fi
-
exit 0
Index: debian/finish-install
===================================================================
--- debian/finish-install (revision 38567)
+++ debian/finish-install (working copy)
@@ -2,14 +2,22 @@
. /usr/share/debconf/confmodule
+# Silently exit if we're using a serial console
+db_get debian-installer/serial-console
+if [ "$RET" != false ]; then
+ exit 0
+
+fi
+
+# Silently exit if no keymap is set
db_get debian-installer/keymap
KEYMAP=$RET
-if [ -z "$KEYMAP" ];
-then
- # keymap not set; probably didn't call kbd-chooser
+if [ -z "$KEYMAP" ]; then
exit 0
fi
+apt-install console-tools console-data console-common || true
+
# Install non-Unicode variants of Turkish keymaps
if [ "$KEYMAP" = "trqu" ]; then
KEYMAP="trq"
@@ -20,19 +28,16 @@
db_set debian-installer/keymap $KEYMAP
fi
-db_get debian-installer/serial-console
-if [ "$RET" = "false" ] ; then
- # FIXME Workaround to install some keymaps properly
- case "$KEYMAP" in
- trq|trf|hebrew|lt|lv-latin4|ua)
- kbd_mode_temp="ascii" ;;
- *)
- kbd_mode_temp="" ;;
- esac
+# FIXME Workaround to install some keymaps properly
+case "$KEYMAP" in
+ trq|trf|hebrew|lt|lv-latin4|ua)
+ kbd_mode_temp="ascii" ;;
+ *)
+ kbd_mode_temp="" ;;
+esac
- [ -n "$kbd_mode_temp" ] && kbd-mode --$kbd_mode_temp
- chroot /target install-keymap $KEYMAP
- [ -n "$kbd_mode_temp" ] && kbd-mode --unicode
-fi
+[ -n "$kbd_mode_temp" ] && kbd-mode --$kbd_mode_temp
+chroot /target install-keymap $KEYMAP
+[ -n "$kbd_mode_temp" ] && kbd-mode --unicode
exit 0
Index: debian/rules
===================================================================
--- debian/rules (revision 38567)
+++ debian/rules (working copy)
@@ -21,7 +21,7 @@
dh_clean -k
dh_installdirs
$(MAKE) install DESTDIR=$(CURDIR)/debian/kbd-chooser
- install -m0755 debian/finish-install debian/$(PACKAGE)/usr/lib/finish-install.d/70kbd-chooser
+ install -m0755 debian/finish-install debian/$(PACKAGE)/usr/lib/post-base-installer.d/70kbd-chooser
install -m0644 debian/S55kbd-chooser debian/$(PACKAGE)/lib/debian-installer-startup.d/S55kbd-chooser
binary-indep:
Index: debian/dirs
===================================================================
--- debian/dirs (revision 38567)
+++ debian/dirs (working copy)
@@ -1,3 +1,3 @@
usr/bin
-usr/lib/finish-install.d
+usr/lib/post-base-installer.d
lib/debian-installer-startup.d
--- End Message ---
--- Begin Message ---
Source: kbd-chooser
Source-Version: 1.29
We believe that the bug you reported is fixed in the latest version of
kbd-chooser, which is due to be installed in the Debian FTP archive:
kbd-chooser_1.29.dsc
to pool/main/k/kbd-chooser/kbd-chooser_1.29.dsc
kbd-chooser_1.29.tar.gz
to pool/main/k/kbd-chooser/kbd-chooser_1.29.tar.gz
kbd-chooser_1.29_i386.udeb
to pool/main/k/kbd-chooser/kbd-chooser_1.29_i386.udeb
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to 376310@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Frans Pop <fjp@debian.org> (supplier of updated kbd-chooser package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmaster@debian.org)
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Format: 1.7
Date: Mon, 3 Jul 2006 22:53:19 +0200
Source: kbd-chooser
Binary: kbd-chooser
Architecture: source i386
Version: 1.29
Distribution: unstable
Urgency: low
Maintainer: Debian Install System Team <debian-boot@lists.debian.org>
Changed-By: Frans Pop <fjp@debian.org>
Description:
kbd-chooser - Detect a keyboard and select layout (udeb)
Closes: 376310
Changes:
kbd-chooser (1.29) unstable; urgency=low
.
[ Frans Pop ]
* usb-kbd.c: Switch back to using USB-MAC keymaps for powerpc as otherwise
the mode switch key (for accented characters) is mapped to the wrong key.
* Move finish-install script to base-installer to allow inclusion of keymap
in initrd. Based on patch from David Härdeman. Closes: #376310.
.
[ Colin Watson ]
* Make xstrdup() prototype const-correct.
.
[ Updated translations ]
* Estonian (et.po) by Siim Põder
* Galician (gl.po) by Jacobo Tarrio
Files:
f1a68f0eaf3d73a54f6f2966136d1416 898 debian-installer optional kbd-chooser_1.29.dsc
b71d0af951c4d6b398df9c23328c6fc9 84497 debian-installer optional kbd-chooser_1.29.tar.gz
baa0126d7af488b06e6d1a02cf6a6c4c 40906 debian-installer optional kbd-chooser_1.29_i386.udeb
Package-Type: udeb
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
iD8DBQFEqYWRgm/Kwh6ICoQRApquAJ9yOFOUXPFHq1YmQaEyOzHR7CbK9wCfZhyC
/Chky0+tusR+yj5gZ3pQWU8=
=8SNu
-----END PGP SIGNATURE-----
--- End Message ---