From 78f812de87f2bde7b83d9b87977a7e4cc6c29aa6 Mon Sep 17 00:00:00 2001 From: Ben Armstrong Date: Fri, 22 Jan 2010 10:03:23 +0100 Subject: [PATCH] Correcting keyboard handling for squeeze. --- scripts/live-bottom/19keyboard | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/scripts/live-bottom/19keyboard b/scripts/live-bottom/19keyboard index 1df83fb..658e44a 100755 --- a/scripts/live-bottom/19keyboard +++ b/scripts/live-bottom/19keyboard @@ -63,17 +63,17 @@ fi if [ -x /root/bin/setupcon ] then - if [ -f /root/etc/default/console-setup ] - then - # lenny - KEYBOARD_FILE="/root/etc/default/console-setup" - elif [ -f /root/etc/default/keyboard ] + if [ -f /root/etc/default/keyboard ] then # squeeze - KEYBOARD_FILE="/root/etc/default/keyboard" + KEYBOARD_FILE="/etc/default/keyboard" + elif [ -f /root/etc/default/console-setup ] + then + # lenny + KEYBOARD_FILE="/etc/default/console-setup" fi - if [ -n "${KEYBOARD_FILE}" ] + if [ -n "/root${KEYBOARD_FILE}" ] then if [ "${cslayout}" ] then -- 2.1.4