Bug#619711: console-setup: breaks copying keymap to initramfs
Package: initramfs-tools
Version: 0.99
Followup-For: Bug #619711
Hello,
please find attached a patch for the keymap hook, which fixes the bug as
described by Anton Zinoviev <anton@lml.bas.bg> in the email 'Re: Bug#619711:
console-setup: breaks copying keymap to initramfs' from Tue, 29 Mar 2011
15:04:57 +0300.
Regards,
Andreas
-- Package-specific info:
-- initramfs sizes
-- /proc/cmdline
BOOT_IMAGE=/vmlinuz-3.2.0-1-amd64 root=/dev/mapper/andreas--notebook-root ro quiet splash
-- resume
RESUME=/dev/mapper/andreas--notebook-swap_1
-- /proc/filesystems
ext4
ext2
fuseblk
-- lsmod
Module Size Used by
ip6table_filter 12540 0
ip6_tables 22175 1 ip6table_filter
ebtable_nat 12580 0
ebtables 26235 1 ebtable_nat
ipt_MASQUERADE 12594 3
iptable_nat 12928 1
nf_nat 18242 2 ipt_MASQUERADE,iptable_nat
nf_conntrack_ipv4 14078 4 iptable_nat,nf_nat
nf_defrag_ipv4 12483 1 nf_conntrack_ipv4
xt_state 12503 1
nf_conntrack 52720 5 ipt_MASQUERADE,iptable_nat,nf_nat,nf_conntrack_ipv4,xt_state
ipt_REJECT 12502 2
xt_CHECKSUM 12471 1
iptable_mangle 12536 1
acpi_cpufreq 12935 1
mperf 12453 1 acpi_cpufreq
xt_tcpudp 12570 5
cpufreq_stats 12866 0
cpufreq_powersave 12454 0
cpufreq_userspace 12576 0
cpufreq_conservative 13147 0
iptable_filter 12536 1
ip_tables 22042 3 iptable_nat,iptable_mangle,iptable_filter
x_tables 19073 12 ip6table_filter,ip6_tables,ebtables,ipt_MASQUERADE,iptable_nat,xt_state,ipt_REJECT,xt_CHECKSUM,iptable_mangle,xt_tcpudp,iptable_filter,ip_tables
bridge 70728 0
stp 12392 1 bridge
hdaps 13616 1
parport_pc 22364 0
ppdev 12763 0
lp 17149 0
parport 31858 3 parport_pc,ppdev,lp
bnep 17567 2
rfcomm 33656 0
binfmt_misc 12957 1
uinput 17440 1
fuse 61981 1
nfsd 211858 2
nfs 312062 0
lockd 67328 2 nfsd,nfs
fscache 36739 1 nfs
auth_rpcgss 37143 2 nfsd,nfs
nfs_acl 12511 2 nfsd,nfs
sunrpc 173671 6 nfsd,nfs,lockd,auth_rpcgss,nfs_acl
kvm_intel 121968 0
kvm 287572 1 kvm_intel
ext2 59231 1
tp_smapi 23531 0
thinkpad_ec 12857 2 hdaps,tp_smapi
loop 22641 0
snd_hda_codec_hdmi 30783 1
snd_hda_codec_conexant 45245 1
btusb 17502 0
bluetooth 119406 11 bnep,rfcomm,btusb
uvcvideo 57744 0
videodev 70889 1 uvcvideo
snd_hda_intel 26345 2
snd_hda_codec 77994 3 snd_hda_codec_hdmi,snd_hda_codec_conexant,snd_hda_intel
media 18148 2 uvcvideo,videodev
arc4 12458 2
v4l2_compat_ioctl32 16655 1 videodev
joydev 17266 0
hid_logitech_dj 17247 0
snd_hwdep 13186 1 snd_hda_codec
snd_pcm 63900 3 snd_hda_codec_hdmi,snd_hda_intel,snd_hda_codec
snd_seq 45093 0
snd_timer 22917 2 snd_pcm,snd_seq
iwlwifi 166703 0
snd_seq_device 13176 1 snd_seq
mac80211 192768 1 iwlwifi
ac 12624 0
thinkpad_acpi 61270 0
battery 13109 0
power_supply 13475 2 ac,battery
nvram 13049 1 thinkpad_acpi
iTCO_wdt 17081 0
iTCO_vendor_support 12704 1 iTCO_wdt
snd 52850 14 snd_hda_codec_hdmi,snd_hda_codec_conexant,snd_hda_intel,snd_hda_codec,snd_hwdep,snd_pcm,snd_seq,snd_timer,snd_seq_device,thinkpad_acpi
cfg80211 137140 2 iwlwifi,mac80211
i2c_i801 16870 0
rfkill 19012 5 bluetooth,thinkpad_acpi,cfg80211
psmouse 64455 0
serio_raw 12931 0
evdev 17562 23
soundcore 13065 1 snd
snd_page_alloc 13003 2 snd_hda_intel,snd_pcm
wmi 13243 0
processor 28059 1 acpi_cpufreq
ext4 350557 1
mbcache 13065 2 ext2,ext4
jbd2 62015 1 ext4
crc16 12343 2 bluetooth,ext4
sha256_generic 16797 2
aesni_intel 50643 24
cryptd 14517 9 aesni_intel
aes_x86_64 16796 1 aesni_intel
aes_generic 33026 2 aesni_intel,aes_x86_64
cbc 12754 0
dm_crypt 22586 1
dm_mod 63545 9 dm_crypt
sr_mod 21899 0
sd_mod 36136 3
cdrom 35401 1 sr_mod
crc_t10dif 12348 1 sd_mod
usbhid 36379 1 hid_logitech_dj
hid 81288 2 hid_logitech_dj,usbhid
i915 351781 4
drm_kms_helper 27227 1 i915
drm 167670 5 i915,drm_kms_helper
i2c_algo_bit 12841 1 i915
ahci 24997 2
libahci 22860 1 ahci
xhci_hcd 73208 0
libata 140589 2 ahci,libahci
ehci_hcd 40215 0
scsi_mod 162417 3 sr_mod,sd_mod,libata
button 12937 1 i915
e1000e 124918 0
sdhci_pci 17976 0
sdhci 27053 1 sdhci_pci
mmc_core 72460 2 sdhci_pci,sdhci
usbcore 128498 6 btusb,uvcvideo,usbhid,xhci_hcd,ehci_hcd
usb_common 12354 1 usbcore
thermal 17383 0
i2c_core 23876 6 videodev,i2c_i801,i915,drm_kms_helper,drm,i2c_algo_bit
video 17628 1 i915
thermal_sys 18040 3 processor,thermal,video
-- /etc/initramfs-tools/modules
intel_agp
drm
i915 modeset=1
-- /etc/kernel-img.conf
# Kernel image management overrides
# See kernel-img.conf(5) for details
do_symlinks = yes
do_bootloader = no
do_initrd = yes
link_in_boot = no
-- /etc/initramfs-tools/initramfs.conf
MODULES=most
BUSYBOX=y
KEYMAP=y
COMPRESS=gzip
BOOT=local
DEVICE=
NFSROOT=auto
-- /etc/initramfs-tools/update-initramfs.conf
update_initramfs=yes
backup_initramfs=no
-- /etc/crypttab
sda5_crypt UUID=7326340f-32f9-4ece-84dc-e309b3b82454 none luks
-- mkinitramfs hooks
/etc/initramfs-tools/hooks/:
/usr/share/initramfs-tools/hooks:
busybox
cryptgnupg
cryptkeyctl
cryptopenct
cryptopensc
cryptpassdev
cryptroot
dmsetup
fuse
keymap
klibc
lvm2
ntfs_3g
plymouth
thermal
udev
-- System Information:
Debian Release: wheezy/sid
APT prefers testing
APT policy: (500, 'testing')
Architecture: amd64 (x86_64)
Kernel: Linux 3.2.0-1-amd64 (SMP w/4 CPU cores)
Locale: LANG=de_DE.utf8, LC_CTYPE=de_DE.utf8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Versions of packages initramfs-tools depends on:
ii cpio 2.11-7
ii findutils 4.4.2-4
ii klibc-utils 1.5.25-1.1
ii module-init-tools 3.16-1
ii udev 175-3
Versions of packages initramfs-tools recommends:
ii busybox 1:1.19.3-5
Versions of packages initramfs-tools suggests:
ii bash-completion 1:1.99-3
-- Configuration Files:
/etc/initramfs-tools/initramfs.conf changed [not included]
-- no debconf information
diff -crB initramfs-tools-0.99/hooks/keymap initramfs-tools-0.99_keymapfix/hooks/keymap
*** initramfs-tools-0.99/hooks/keymap 2010-08-25 21:32:27.000000000 +0200
--- initramfs-tools-0.99_keymapfix/hooks/keymap 2012-02-15 14:01:15.880893860 +0100
***************
*** 21,40 ****
fi
# Step 1 - Basic tools
! if [ ! -x /bin/loadkeys ] ||
! ! ( [ -r /etc/console/boottime.kmap.gz ] \
! || [ -r /etc/console-setup/cached.kmap.gz ] ); then
exit 0
fi
. /usr/share/initramfs-tools/hook-functions
copy_exec /bin/loadkeys /bin
! if [ -e /etc/console-setup/cached.kmap.gz ]; then
! cp /etc/console-setup/cached.kmap.gz ${DESTDIR}/etc/boottime.kmap.gz
! else
! cp /etc/console/boottime.kmap.gz ${DESTDIR}/etc/
! fi
# Step 2 - Check for UTF8 console
if [ ! -x /usr/bin/kbd_mode ]; then
--- 21,34 ----
fi
# Step 1 - Basic tools
! if [ ! -x /bin/loadkeys ] || [ ! -x /bin/setupcon ]; then
exit 0
fi
. /usr/share/initramfs-tools/hook-functions
copy_exec /bin/loadkeys /bin
! /bin/setupcon --save-keyboard ${DESTDIR}/etc/boottime.kmap.gz
# Step 2 - Check for UTF8 console
if [ ! -x /usr/bin/kbd_mode ]; then
Reply to: