diff options
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 |
commit | 9cdbfd7bad759454e81f78006b2fd0649caa1137 (patch) | |
tree | 6a3643a6af4f60fb19c38ee2fc75a53563261ffa /make_slackware_live.sh | |
parent | 3098f2b255857aa71f6d2453fb28a0a00a2d8ceb (diff) | |
download | liveslak-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 'make_slackware_live.sh')
-rwxr-xr-x | make_slackware_live.sh | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/make_slackware_live.sh b/make_slackware_live.sh index f31485e..7ff7196 100755 --- a/make_slackware_live.sh +++ b/make_slackware_live.sh @@ -378,7 +378,7 @@ EOL fi cat <<EOL >> ${MENUROOTDIR}/lang_${LANCOD}.cfg kernel /boot/generic - append initrd=/boot/initrd.img load_ramdisk=1 prompt_ramdisk=0 rw printk.time=0 kbd=$KBD tz=$(cat ${LIVE_TOOLDIR}/languages |grep "^$SUBCOD:" |cut -d: -f4) locale=$(cat ${LIVE_TOOLDIR}/languages |grep "^$SUBCOD:" |cut -d: -f5) + append initrd=/boot/initrd.img load_ramdisk=1 prompt_ramdisk=0 rw printk.time=0 kbd=$KBD tz=$(cat ${LIVE_TOOLDIR}/languages |grep "^$SUBCOD:" |cut -d: -f4) locale=$(cat ${LIVE_TOOLDIR}/languages |grep "^$SUBCOD:" |cut -d: -f5) xkb=$(cat ${LIVE_TOOLDIR}/languages |grep "^$SUBCOD:" |cut -d: -f6) EOL done @@ -434,13 +434,16 @@ EOL for LANCOD in $(cat languages |grep -Ev "(^ *#|^$)" |cut -d: -f1) ; do LANDSC=$(cat languages |grep "^$LANCOD:" |cut -d: -f2) KBD=$(cat languages |grep "^$LANCOD:" |cut -d: -f3) + XKB=$(cat languages |grep "^$LANCOD:" |cut -d: -f6) LANLOC=$(cat languages |grep "^$LANCOD:" |cut -d: -f5) # Add this entry to the keyboard selection menu: cat <<EOL >> ${GRUBDIR}/kbd.cfg menuentry "${LANDSC}" { set sl_kbd="$KBD" + set sl_xkb="$XKB" set sl_lang="$LANDSC" export sl_kbd + export sl_xkb export sl_lang configfile \$grubdir/grub.cfg } |