log_begin_msg "$DESCRIPTION"
-kbd=
+kbd=us
cslayout=
csvariant=
csmodel=
-# commandline
-if [ -n "${KBD}" ]; then
- kbd="${KBD}"
-else
- kbd=us
-fi
-
-really_export kbd
-
-if [ -n "${KLAYOUT}" ]; then
- cslayout="${KLAYOUT}"
-fi
-if [ -n "${KVARIANT}" ]; then
- csvariant="${KVARIANT}"
-fi
-if [ -n "${KMODEL}" ]; then
- csmodel="${KMODEL}"
-fi
+for x in $(cat /proc/cmdline); do
+ case $x in
+ kbd-chooser/method=*)
+ kbd=${x#kbd-chooser/method=}
+ ;;
+ console-setup/layoutcode=*)
+ cslayout=${x#console-setup/layoutcode=}
+ ;;
+ console-setup/variantcode=*)
+ csvariant=${x#console-setup/variantcode=}
+ ;;
+ console-setup/modelcode=*)
+ csmodel=${x#console-setup/modelcode=}
+ ;;
+ esac
+done
if [ -x /root/bin/setupcon ] && [ -f /root/etc/default/console-setup ]; then
if [ "$cslayout" ]; then
else
chroot /root /usr/sbin/install-keymap $kbd
casper-preseed /root debian-installer/keymap "$kbd"
- casper-preseed /root kbd-chooser/method "$kbd"
fi
log_end_msg