Bug#595827: initramfs-tools: Add hid-cherry and hid-logitech to initramfs

[Eckhart Wörner <ewoerner@kde.org>]

Package: initramfs-tools
Version: 0.98.1
Severity: important
Tags: patch

Both a Cherry and a Logitech keyboard I own cannot be used at early boot time unless one also adds the hid-cherry / the hid-logitech module to the initramfs. The attached patch adds those two modules to hook-functions.

For the Cherry keyboard, kernels up to 2.6.32-3 are not affected, from 2.6.32-5 (squeeze default) onwards all tested kernels were affected. Didn't do detailed checks for the Logitech keyboard.

The used devices that exhibit this problem are:
ID 046d:c30a Logitech, Inc. iTouch Composite
ID 046a:0023 Cherry GmbH CyMotion Master Linux Keyboard

Severity level important, since this makes booting with encrypted root partition impossible using those keyboards.

-- System Information:
Debian Release: squeeze/sid
  APT prefers testing
  APT policy: (600, 'testing'), (500, 'lucid'), (400, 'experimental'), (400, 'unstable')
Architecture: i386 (i686)

Kernel: Linux 2.6.35-trunk-686 (SMP w/2 CPU cores)
Locale: LANG=de_DE.UTF-8, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash

Versions of packages initramfs-tools depends on:
ii  cpio                          2.11-4     GNU cpio -- a program to manage ar
ii  findutils                     4.4.2-1    utilities for finding files--find,
ii  klibc-utils                   1.5.20-1   small utilities built with klibc f
ii  module-init-tools             3.12-1     tools for managing Linux kernel mo
ii  udev                          161-1      /dev/ and hotplug management daemo

Versions of packages initramfs-tools recommends:
ii  busybox                       1:1.17.1-4 Tiny utilities for small and embed

Versions of packages initramfs-tools suggests:
ii  bash-completion               1:1.2-2    programmable completion for the ba

-- no debconf information

diff --git a/hook-functions b/hook-functions
index 9d63d58..0684296 100644
--- a/hook-functions
+++ b/hook-functions
@@ -394,7 +394,7 @@ auto_add_modules()
 	case "${1:-}" in
 	base)
 		for x in ehci-hcd ohci-hcd uhci-hcd usbhid xhci hid-apple \
-		hid-microsoft \
+		hid-cherry hid-logitech hid-microsoft \
 		btrfs ext2 ext3 ext4 ext4dev isofs jfs nfs reiserfs udf xfs \
 		af_packet atkbd i8042 virtio_pci; do
 			manual_add_modules "${x}"