[SCM] Debian Live initramfs hook branch, master, updated. 1.156.1-1-7-ge29d44f

[Daniel Baumann]

The following commit has been merged in the master branch:
commit e29d44f2644dd97afd37756574abb0b0496d79af
Author: Daniel Baumann <daniel at debian.org>
Date:   Fri Mar 6 10:13:34 2009 +0100

    Only calling install-keymap if it's actually installed, which is always but in minimal images the case though (Closes: #517153).

diff --git a/scripts/live-bottom/19keyboard b/scripts/live-bottom/19keyboard
index 2bf0b1c..f7c4d65 100755
--- a/scripts/live-bottom/19keyboard
+++ b/scripts/live-bottom/19keyboard
@@ -93,7 +93,7 @@ then
 	live-preseed /root console-setup/codesetcode '' false
 
 	sed -i 's/CONSOLE_SCREEN=$/CONSOLE_SCREEN=setupcon/; t END; b; : END; n; b END' /root/etc/init.d/usplash
-else
+elif [ -e /root/usr/sbin/install-keymap ]
 	chroot /root /usr/sbin/install-keymap ${kbd}
 	live-preseed /root debian-installer/keymap "${kbd}"
 	live-preseed /root kbd-chooser/method "${kbd}"

-- 
Debian Live initramfs hook