diff options
| author | Daniel Baumann <daniel@debian.org> | 2007-09-23 14:46:26 +0200 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2007-09-23 14:46:26 +0200 |
| commit | 269ea83c30e08ac2f82cea67b5d6ac065a67cbef (patch) | |
| tree | dba61cdceb42ccacbd6f928b7abce2e1d84a3bd2 /scripts/casper-bottom/19keyboard | |
| parent | 4042b2eda2107dda511a29ae376d9724e0fd7a33 (diff) | |
| download | live-boot-269ea83c30e08ac2f82cea67b5d6ac065a67cbef.tar.gz live-boot-269ea83c30e08ac2f82cea67b5d6ac065a67cbef.zip | |
Adding casper 1.77+debian-1.
Diffstat (limited to 'scripts/casper-bottom/19keyboard')
| -rwxr-xr-x | scripts/casper-bottom/19keyboard | 54 |
1 files changed, 34 insertions, 20 deletions
diff --git a/scripts/casper-bottom/19keyboard b/scripts/casper-bottom/19keyboard index 1d833ad..7acc4e4 100755 --- a/scripts/casper-bottom/19keyboard +++ b/scripts/casper-bottom/19keyboard @@ -23,28 +23,42 @@ log_begin_msg "$DESCRIPTION" kbd=us cslayout= csvariant= +csmodel= -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=} - ;; - esac -done - -if [ "$cslayout" ] && [ -x /root/bin/setupcon ] && \ - [ -f /root/etc/default/console-setup ]; then - chroot /root sed -i "s/^XKBLAYOUT=.*/XKBLAYOUT=\"$cslayout\"/" \ - /etc/default/console-setup - if [ "$csvariant" ]; then - chroot /root sed -i "s/^XKBVARIANT=.*/XKBVARIANT=\"$csvariant\"/" \ +# commandline +if [ ! -z "${KBD}" ]; then + kbd="${KBD}" +fi +if [ ! -z "${CSLAYOUT}" ]; then + cslayout="${CSLAYOUT}" +fi +if [ ! -z "${CSVARIANT}" ]; then + csvariant="${CSVARIANT}" +fi +if [ ! -z "${CSMODEL}" ]; then + csmodel="${CSMODEL}" +fi + +if [ -x /root/bin/setupcon ] && [ -f /root/etc/default/console-setup ]; then + if [ "$cslayout" ]; then + chroot /root sed -i "s/^XKBLAYOUT=.*/XKBLAYOUT=\"$cslayout\"/" \ /etc/default/console-setup + if [ "$csvariant" ]; then + chroot /root sed -i "s/^XKBVARIANT=.*/XKBVARIANT=\"$csvariant\"/" \ + /etc/default/console-setup + else + casper-preseed /root console-setup/variantcode '' false + fi + if [ "$csmodel" ]; then + chroot /root sed -i "s/^XKBMODEL=.*/XKBMODEL=\"$csmodel\"/" \ + /etc/default/console-setup + else + casper-preseed /root console-setup/modelcode '' false + fi + else + casper-preseed /root console-setup/layoutcode '' false + casper-preseed /root console-setup/variantcode '' false + casper-preseed /root console-setup/modelcode '' false fi else chroot /root /usr/sbin/install-keymap $kbd |