diff options
| author | Daniel Baumann <daniel@debian.org> | 2007-09-23 14:46:36 +0200 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 17:24:35 +0100 |
| commit | 4bdaa2237c6ae923d1dd068e9024ebceca3f40d9 (patch) | |
| tree | 5a563ee3109e324ae7002f0550ac9850254c1ecd /scripts/casper-bottom/19keyboard | |
| parent | c972c6eea545add125883eaaeea459551e54589c (diff) | |
| download | live-boot-4bdaa2237c6ae923d1dd068e9024ebceca3f40d9.tar.gz live-boot-4bdaa2237c6ae923d1dd068e9024ebceca3f40d9.zip | |
Adding live-initramfs 1.87.1-1.
Diffstat (limited to 'scripts/casper-bottom/19keyboard')
| -rwxr-xr-x | scripts/casper-bottom/19keyboard | 37 |
1 files changed, 17 insertions, 20 deletions
diff --git a/scripts/casper-bottom/19keyboard b/scripts/casper-bottom/19keyboard index 40834d8..ef90115 100755 --- a/scripts/casper-bottom/19keyboard +++ b/scripts/casper-bottom/19keyboard @@ -20,29 +20,27 @@ esac 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 @@ -68,6 +66,5 @@ 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" - casper-preseed /root kbd-chooser/method "$kbd" fi log_end_msg |