diff options
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/live | 30 | ||||
| -rwxr-xr-x | scripts/live-bottom/19keyboard | 123 |
2 files changed, 0 insertions, 153 deletions
diff --git a/scripts/live b/scripts/live index 3e604f6..c525c80 100755 --- a/scripts/live +++ b/scripts/live @@ -150,31 +150,6 @@ Arguments () export STATICIP ;; - keyb=*|kbd-chooser/method=*) - KBD="${ARGUMENT#*=}" - export KBD - ;; - - klayout=*|console-setup/layoutcode=*) - KLAYOUT="${ARGUMENT#*=}" - export KLAYOUT - ;; - - kvariant=*|console-setup/variantcode=*) - KVARIANT="${ARGUMENT#*=}" - export KVARIANT - ;; - - kmodel=*|console-setup/modelcode=*) - KMODEL="${ARGUMENT#*=}" - export KMODEL - ;; - - koptions=*) - KOPTIONS="${ARGUMENT#koptions=}" - export KOPTIONS - ;; - live-getty) LIVE_GETTY="1" export LIVE_GETTY @@ -235,11 +210,6 @@ Arguments () export NOAUTOLOGIN ;; - noconsolekeyboard) - NOCONSOLEKEYBOARD="Yes" - export NOCONSOLEKEYBOARD - ;; - nofastboot) NOFASTBOOT="Yes" export NOFASTBOOT diff --git a/scripts/live-bottom/19keyboard b/scripts/live-bottom/19keyboard deleted file mode 100755 index 5a262fa..0000000 --- a/scripts/live-bottom/19keyboard +++ /dev/null @@ -1,123 +0,0 @@ -#!/bin/sh - -#set -e - -# initramfs-tools header - -PREREQ="" - -prereqs() -{ - echo "${PREREQ}" -} - -case "${1}" in - prereqs) - prereqs - exit 0 - ;; -esac - -# live-boot header - -if [ -n "${NOCONSOLEKEYBOARD}" ] -then - exit 0 -fi - -. /scripts/live-functions - -log_begin_msg "Setting up console keyboard" - -# live-boot script - -kbd= -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 - -if [ -x /root/bin/setupcon ] -then - if [ -f /root/etc/default/keyboard ] - then - # squeeze - KEYBOARD_FILE="/etc/default/keyboard" - elif [ -f /root/etc/default/console-setup ] - then - # lenny - KEYBOARD_FILE="/etc/default/console-setup" - fi - - if [ -n "/root${KEYBOARD_FILE}" ] - then - if [ "${cslayout}" ] - then - 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 - live-preseed /root console-setup/modelcode '' false - fi - - live-preseed /root console-setup/optionscode '' false - live-preseed /root console-setup/codesetcode '' false - - if [ -f /root/etc/init.d/usplash ] - then - sed -i 's/CONSOLE_SCREEN=$/CONSOLE_SCREEN=setupcon/; t END; b; : END; n; b END' /root/etc/init.d/usplash - elif [ -f /root/etc/init/usplash.conf ] - then - sed -i '/^post-stop script/a\ - setupcon' /root/etc/init/usplash.conf - fi - fi -elif [ -e /root/usr/sbin/install-keymap ] -then - chroot /root /usr/sbin/install-keymap ${kbd} - live-preseed /root debian-installer/keymap "${kbd}" - live-preseed /root kbd-chooser/method "${kbd}" -fi - -log_end_msg |