=== modified file 'a/casper-bottom/19keyboard'
--- a/casper-bottom/19keyboard	
+++ b/casper-bottom/19keyboard	
@@ -31,8 +31,10 @@
 done
 
 chroot /root /usr/sbin/install-keymap $kbd
-chroot /root debconf-communicate -fnoninteractive > /dev/null <<EOF
+if ! echo "set debian-installer/keymap $kbd" | chroot /root debconf-communicate -fnoninteractive > /dev/null; then
+	chroot /root debconf-communicate -fnoninteractive >/dev/null <<EOF
 register debian-installer/dummy debian-installer/keymap
 set debian-installer/keymap $kbd
 EOF
+fi
 log_end_msg