summaryrefslogtreecommitdiffstats
path: root/liveinit
diff options
context:
space:
mode:
author Eric Hameleers <alien@slackware.com>2016-02-09 00:44:18 +0100
committer Eric Hameleers <alien@slackware.com>2016-02-09 00:44:18 +0100
commit9cdbfd7bad759454e81f78006b2fd0649caa1137 (patch)
tree6a3643a6af4f60fb19c38ee2fc75a53563261ffa /liveinit
parent3098f2b255857aa71f6d2453fb28a0a00a2d8ceb (diff)
downloadliveslak-9cdbfd7bad759454e81f78006b2fd0649caa1137.tar.gz
liveslak-9cdbfd7bad759454e81f78006b2fd0649caa1137.tar.xz
Make X Keyboard configuration work properly.
- fix detection of german (de) keyboard layout to configure Compose Key, - actually use field #6 of the languages file (X Keyboard layout & variant) when generating the grub and syslinux boot configuration files.
Diffstat (limited to '')
-rwxr-xr-xliveinit12
1 files changed, 6 insertions, 6 deletions
diff --git a/liveinit b/liveinit
index 443da4c..68beec6 100755
--- a/liveinit
+++ b/liveinit
@@ -512,12 +512,6 @@ EOT
# You can set just the XkbVariant by adding something like "kbd=ch xkb=,fr"
XKBLAYOUT=$(echo $XKB |cut -d, -f1)
XKBVARIANT=$(echo $XKB |cut -d, -f2)
- if [ "$XKBLAYOUT" = "de" ]; then
- # Germans use the AltGr key, so Scroll Lock will be their Compose Key:
- XKBOPTIONS="compose:sclk"
- else
- XKBOPTIONS="compose:ralt"
- fi
# Ensure that XKBLAYOUT gets a value; XKBVARIANT is allowed to be empty.
if [ -z "$XKBLAYOUT" ]; then
if [ -z "$KEYMAP" ]; then
@@ -530,6 +524,12 @@ EOT
XKBLAYOUT="us"
fi
echo "${MARKER}: Switching live X desktop to '$XKBLAYOUT' keyboard"
+ # Germans use the AltGr key, so Scroll Lock will be their Compose Key:
+ if [ "$XKBLAYOUT" = "de" ]; then
+ XKBOPTIONS="compose:sclk"
+ else
+ XKBOPTIONS="compose:ralt"
+ fi
# If the layout is not 'us' then add 'us' as a secondary nevertheless:
if [ "$XKBLAYOUT" != "us" ]; then
XKBLAYOUT="$XKBLAYOUT,us"