Fabian Vogt
ef8e5d4ea9
- Add new method of invocation for jeos-firstboot - Try to overwrite existing values in vconsole.conf - Don't write _NOT countries into zypp/RequestedLocales - Add sysconfig handling back - Ignore suffix on passed locale - Call set-keymap after set-x11-keymap - Restart of systemd-vconsole-setup is not necessary OBS-URL: https://build.opensuse.org/request/show/616854 OBS-URL: https://build.opensuse.org/package/show/system:install:head/live-langset-data?expand=0&rev=15
82 lines
2.6 KiB
Bash
82 lines
2.6 KiB
Bash
#!/bin/sh
|
|
|
|
# Support two methods of invocation:
|
|
# a) Called without arguments, use /proc/cmdline (lang= and keytable=)
|
|
# b) Called with arguments, use $1 as lang and $2 as keytable
|
|
|
|
if [ $# != 0 ]; then
|
|
lang=$1
|
|
keytable=$2
|
|
else
|
|
lang=en_US
|
|
for o in $(cat /proc/cmdline); do
|
|
case $o in
|
|
lang=*)
|
|
eval $o
|
|
;;
|
|
keytable=*)
|
|
eval $o
|
|
;;
|
|
esac
|
|
done
|
|
fi
|
|
|
|
# Strip potential .UTF-8 suffix
|
|
lang="${lang%%.*}"
|
|
|
|
Country=$(echo "$lang" | cut -d_ -f2)
|
|
Language=$(echo "$lang" | cut -d_ -f1)
|
|
|
|
file="/usr/share/langset/$Language""_$Country"
|
|
if ! test -f "$file"; then
|
|
file="/usr/share/langset/$Language"
|
|
fi
|
|
|
|
# Read all values of the langset data files
|
|
. "$file"
|
|
|
|
# Apply all options
|
|
[ -n "$RC_LC_MESSAGES" ] || RC_LC_MESSAGES=$RC_LANG
|
|
[ -z "$RC_LANG" ] || localectl set-locale LANG=$RC_LANG LC_MESSAGES=$RC_LC_MESSAGES
|
|
|
|
# set_vconsole_option KEY value
|
|
set_vconsole_option() {
|
|
# "t;q1" means that this sed command exits with 1 if no substitution was done
|
|
sed -i"" -E "s/^$1=.+\$/$1=$2/g;t;q1" /etc/vconsole.conf && return
|
|
echo "$1=$2" >> /etc/vconsole.conf
|
|
}
|
|
|
|
[ -z "$CONSOLE_FONT" ] || set_vconsole_option FONT "$CONSOLE_FONT"
|
|
[ -z "$CONSOLE_SCREENMAP" ] || set_vconsole_option FONT_MAP "$CONSOLE_SCREENMAP"
|
|
[ -z "$CONSOLE_UNICODEMAP" ] || set_vconsole_option FONT_UNIMAP "$CONSOLE_UNICODEMAP"
|
|
|
|
# set_sysconfig_option KEY value
|
|
set_sysconfig_option() {
|
|
sed -i -e "s#$1=\".*#$1=\"$2\"#" /etc/sysconfig/language
|
|
sed -i -e "s#$1=\".*#$1=\"$2\"#" /etc/sysconfig/keyboard
|
|
sed -i -e "s#$1=\".*#$1=\"$2\"#" /etc/sysconfig/console
|
|
}
|
|
|
|
# Set legacy sysconfig values for backwards-compat
|
|
[ -z "$CONSOLE_FONT" ] || set_sysconfig_option CONSOLE_FONT "$CONSOLE_FONT"
|
|
[ -z "$CONSOLE_SCREENMAP" ] || set_sysconfig_option CONSOLE_SCREENMAP "$CONSOLE_SCREENMAP"
|
|
[ -z "$CONSOLE_UNICODEMAP" ] || set_sysconfig_option CONSOLE_UNICODEMAP "$CONSOLE_UNICODEMAP"
|
|
[ -z "$RC_LANG" ] || set_sysconfig_option RC_LANG "$RC_LANG"
|
|
[ -z "$RC_LC_MESSAGES" ] || set_sysconfig_option RC_LC_MESSAGES "$RC_LC_MESSAGES"
|
|
[ -z "$KEYTABLE" ] || set_sysconfig_option KEYTABLE "$KEYTABLE"
|
|
[ -z "$COMPOSETABLE" ] || set_sysconfig_option COMPOSETABLE "$COMPOSETABLE"
|
|
|
|
# Try the lang-provided keytable first
|
|
[ -z "$KEYTABLE" ] || localectl set-keymap $KEYTABLE
|
|
|
|
[ -n "$TIMEZONE" ] && [ -f "/usr/share/zoneinfo/$TIMEZONE" ] && rm -f /etc/localtime && ln -s /usr/share/zoneinfo/$TIMEZONE /etc/localtime
|
|
|
|
if [ -n "$XkbLayout" ] && [ -n "$XkbModel" ] && [ -n "$XkbVariant" ] && [ -n "$XkbOptions" ]; then
|
|
localectl set-x11-keymap "$XkbLayout" "$XkbModel" "$XkbVariant" "$XkbOptions"
|
|
fi
|
|
|
|
# Override with the cmdline provided one, if possible
|
|
[ -z "$keytable" ] || localectl set-keymap $keytable
|
|
|
|
echo "$lang" > /var/lib/zypp/RequestedLocales
|