Bug#788441: setupcon ignoring KMAP in the configuration file

[Michal Maruska <mmaruska@gmail.com>]

Package: console-setup
Version: 1.128

Hello,
I use some prebuilt/old console kmap, and don't want one composed of XKB parts.

So I set, in /etc/default/keyboard
KMAP="/usr/share/keymaps/maruska"

and ... it is ignored by setupcon.
I found this patch sufficient to fix it:

diff --git a/setupcon b/setupcon
index e4a0851..2b70ec7 100755
--- a/setupcon
+++ b/setupcon
@@ -695,7 +695,7 @@ fi
 [ -n "$XKBMODEL" -o -z "$savekbdfile" ] || exit 1

 # do_kbd
-[ "$XKBMODEL" ] || do_kbd=''
+[ "$XKBMODEL$KMAP" ] || do_kbd=''
 if [ "$do_kbd" ]; then
     case "$kernel" in
         linux)