diff options
| author | Daniel Baumann <daniel@debian.org> | 2009-12-09 19:39:50 +0100 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 17:48:07 +0100 |
| commit | 108b84438ca88be2cf02cb2abe786a0213c40b2c (patch) | |
| tree | f2dbca1fbdce2b93631740d0b703fc7ef68be981 /scripts | |
| parent | fc6b00203e75e21b101b8298681d3f6f7cfe3759 (diff) | |
| download | live-boot-108b84438ca88be2cf02cb2abe786a0213c40b2c.tar.gz live-boot-108b84438ca88be2cf02cb2abe786a0213c40b2c.zip | |
Updating defaults file of console-setup for squeeze, thanks to Jun NOGATA <nogajun@gmail.com> (Closes: #560187).
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/live-bottom/19keyboard | 57 |
1 files changed, 35 insertions, 22 deletions
diff --git a/scripts/live-bottom/19keyboard b/scripts/live-bottom/19keyboard index d465698..1df83fb 100755 --- a/scripts/live-bottom/19keyboard +++ b/scripts/live-bottom/19keyboard @@ -61,38 +61,51 @@ then csmodel="${KMODEL}" fi -if [ -x /root/bin/setupcon ] && [ -f /root/etc/default/console-setup ] +if [ -x /root/bin/setupcon ] then - if [ "${cslayout}" ] + if [ -f /root/etc/default/console-setup ] then - chroot /root sed -i "s/^XKBLAYOUT=.*/XKBLAYOUT=\"${cslayout}\"/" \ - /etc/default/console-setup + # lenny + KEYBOARD_FILE="/root/etc/default/console-setup" + elif [ -f /root/etc/default/keyboard ] + then + # squeeze + KEYBOARD_FILE="/root/etc/default/keyboard" + fi - if [ "${csvariant}" ] + if [ -n "${KEYBOARD_FILE}" ] + then + if [ "${cslayout}" ] then - chroot /root sed -i "s/^XKBVARIANT=.*/XKBVARIANT=\"${csvariant}\"/" \ - /etc/default/console-setup + chroot /root sed -i "s/^XKBLAYOUT=.*/XKBLAYOUT=\"${cslayout}\"/" \ + ${KEYBOARD_FILE} + + if [ "${csvariant}" ] + then + chroot /root sed -i "s/^XKBVARIANT=.*/XKBVARIANT=\"${csvariant}\"/" \ + ${KEYBOARD_FILE} + else + live-preseed /root console-setup/variantcode '' false + fi + + if [ "${csmodel}" ] + then + chroot /root sed -i "s/^XKBMODEL=.*/XKBMODEL=\"${csmodel}\"/" \ + ${KEYBOARD_FILE} + else + live-preseed /root console-setup/modelcode '' false + fi else + live-preseed /root console-setup/layoutcode '' false live-preseed /root console-setup/variantcode '' false - fi - - if [ "${csmodel}" ] - then - chroot /root sed -i "s/^XKBMODEL=.*/XKBMODEL=\"${csmodel}\"/" \ - /etc/default/console-setup - else live-preseed /root console-setup/modelcode '' false fi - else - live-preseed /root console-setup/layoutcode '' false - live-preseed /root console-setup/variantcode '' false - live-preseed /root console-setup/modelcode '' false - fi - live-preseed /root console-setup/optionscode '' false - live-preseed /root console-setup/codesetcode '' false + live-preseed /root console-setup/optionscode '' false + live-preseed /root console-setup/codesetcode '' false - sed -i 's/CONSOLE_SCREEN=$/CONSOLE_SCREEN=setupcon/; t END; b; : END; n; b END' /root/etc/init.d/usplash + sed -i 's/CONSOLE_SCREEN=$/CONSOLE_SCREEN=setupcon/; t END; b; : END; n; b END' /root/etc/init.d/usplash + fi elif [ -e /root/usr/sbin/install-keymap ] then chroot /root /usr/sbin/install-keymap ${kbd} |