mirror/initramfs-tools
1
0
Fork 0
mirror of https://salsa.debian.org/kernel-team/initramfs-tools.git synced 2026-01-26 15:39:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

mkinitramfs: KEYMAP option fails to work due to missing keymap

Browse Source 
I have attached a patch that makes the keymap hook consider
/etc/console-setup/cached.kmap.gz.

I have also added gunzip to the initramfs because otherwise loadkeys complained
that it was missing and failed to load the keymap.

(closes: #565416)

Signed-off-by: maximilian attems <maks@debian.org>
This commit is contained in:
Maximilian Gass 2010-02-06 21:01:14 +01:00 committed by maximilian attems
parent 323005e4b8
commit 0830e97339
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
hooks/keymap
View File

@ -21,13 +21,20 @@ if [ "$KEYMAP" != "y" ] && [ "$KEYMAP" != "Y" ]; then
fi
# Step 1 - Basic tools
if [ ! -x /bin/loadkeys ] || [ ! -r /etc/console/boottime.kmap.gz ]; then
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
cp /etc/console/boottime.kmap.gz ${DESTDIR}/etc/
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

2
hooks/klibc
View File

@ -18,7 +18,7 @@ esac
# klibc
ln -s /usr/lib/klibc/bin/* ${DESTDIR}/bin
ln -s /lib/klibc-*.so ${DESTDIR}/lib
rm -f ${DESTDIR}/bin/kinit* ${DESTDIR}/bin/gzip ${DESTDIR}/bin/zcat ${DESTDIR}/bin/gunzip
rm -f ${DESTDIR}/bin/kinit* ${DESTDIR}/bin/gzip ${DESTDIR}/bin/zcat
if [ "${BUSYBOX}" = "n" ] || [ ! -e ${BUSYBOXDIR}/busybox ]; then
mv ${DESTDIR}/bin/sh.shared ${DESTDIR}/bin/sh
fi