summaryrefslogtreecommitdiff
path: root/hooks
diff options
context:
space:
mode:
authorMaximilian Gass <mxey@ghosthacking.net>2010-02-06 21:01:14 +0100
committermaximilian attems <maks@debian.org>2010-02-22 23:13:43 +0100
commit0830e97339add137d56d13cdbe07282f3cdba8f6 (patch)
tree7ec36594679be672758f38ba3374a694efe7f8b6 /hooks
parent323005e4b8468ab9f7151d883d3df7b75f130911 (diff)
downloadinitramfs-tools-0830e97339add137d56d13cdbe07282f3cdba8f6.tar.gz
initramfs-tools-0830e97339add137d56d13cdbe07282f3cdba8f6.zip
mkinitramfs: KEYMAP option fails to work due to missing keymap
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>
Diffstat (limited to 'hooks')
-rwxr-xr-xhooks/keymap11
-rwxr-xr-xhooks/klibc2
2 files changed, 10 insertions, 3 deletions
diff --git a/hooks/keymap b/hooks/keymap
index a2b1b08..fa97209 100755
--- a/hooks/keymap
+++ b/hooks/keymap
@@ -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
diff --git a/hooks/klibc b/hooks/klibc
index 56f49ef..663e22c 100755
--- a/hooks/klibc
+++ b/hooks/klibc
@@ -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