Commit b8037547 authored by udeved's avatar udeved
Browse files

manjaro-live: fix x11 kbd layout

parent 7249d6f3
...@@ -240,7 +240,7 @@ write_x11_config(){ ...@@ -240,7 +240,7 @@ write_x11_config(){
# layout not found, use KBLAYOUT # layout not found, use KBLAYOUT
if [[ -z "$X11_LAYOUT" ]]; then if [[ -z "$X11_LAYOUT" ]]; then
X11_LAYOUT="$KBLAYOUT" X11_LAYOUT="${keytable}"
fi fi
# create X11 keyboard layout config # create X11 keyboard layout config
...@@ -262,7 +262,7 @@ write_x11_config(){ ...@@ -262,7 +262,7 @@ write_x11_config(){
configure_language(){ configure_language(){
# hack to be able to set the locale on bootup # hack to be able to set the locale on bootup
local lang=$(get_lang) local lang=$(get_lang)
local keytable=$(get_keytable) keytable=$(get_keytable)
local timezone=$(get_tz) local timezone=$(get_tz)
# Fallback # Fallback
#[[ -z "${lang}" ]] && lang="en_US" #[[ -z "${lang}" ]] && lang="en_US"
...@@ -287,6 +287,9 @@ configure_language(){ ...@@ -287,6 +287,9 @@ configure_language(){
loadkeys "${keytable}" loadkeys "${keytable}"
locale-gen ${lang} locale-gen ${lang}
echo "Configured language: ${lang}" >> /var/log/manjaro-live.log
echo "Configured keymap: ${keytable}" >> /var/log/manjaro-live.log
echo "Configured timezone: ${timezone}" >> /var/log/manjaro-live.log
} }
configure_machine_id(){ configure_machine_id(){
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment