projects
/
live-boot-grml.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Adding casper 1.81+debian-1.
[live-boot-grml.git]
/
scripts
/
casper-bottom
/
19keyboard
diff --git
a/scripts/casper-bottom/19keyboard
b/scripts/casper-bottom/19keyboard
index
81cce72
..
40834d8
100755
(executable)
--- a/
scripts/casper-bottom/19keyboard
+++ b/
scripts/casper-bottom/19keyboard
@@
-1,7
+1,7
@@
#!/bin/sh
PREREQ=""
#!/bin/sh
PREREQ=""
-DESCRIPTION="Setting up keyboard..."
+DESCRIPTION="Setting up
console
keyboard..."
. /scripts/casper-functions
. /scripts/casper-functions
@@
-20,7
+20,7
@@
esac
log_begin_msg "$DESCRIPTION"
log_begin_msg "$DESCRIPTION"
-kbd=
us
+kbd=
cslayout=
csvariant=
csmodel=
cslayout=
csvariant=
csmodel=
@@
-28,15
+28,20
@@
csmodel=
# commandline
if [ -n "${KBD}" ]; then
kbd="${KBD}"
# commandline
if [ -n "${KBD}" ]; then
kbd="${KBD}"
+else
+ kbd=us
fi
fi
-if [ -n "${CSLAYOUT}" ]; then
- cslayout="${CSLAYOUT}"
+
+really_export kbd
+
+if [ -n "${KLAYOUT}" ]; then
+ cslayout="${KLAYOUT}"
fi
fi
-if [ -n "${
CS
VARIANT}" ]; then
- csvariant="${
CS
VARIANT}"
+if [ -n "${
K
VARIANT}" ]; then
+ csvariant="${
K
VARIANT}"
fi
fi
-if [ -n "${
CS
MODEL}" ]; then
- csmodel="${
CS
MODEL}"
+if [ -n "${
K
MODEL}" ]; then
+ csmodel="${
K
MODEL}"
fi
if [ -x /root/bin/setupcon ] && [ -f /root/etc/default/console-setup ]; then
fi
if [ -x /root/bin/setupcon ] && [ -f /root/etc/default/console-setup ]; then
@@
-63,5
+68,6
@@
if [ -x /root/bin/setupcon ] && [ -f /root/etc/default/console-setup ]; then
else
chroot /root /usr/sbin/install-keymap $kbd
casper-preseed /root debian-installer/keymap "$kbd"
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
fi
log_end_msg