pool/live-langset-data
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Drop support for /etc/sysconfig/language (12.x), it was activated

Browse Source 
in staging projects by accident ("Tumbleweed 1")

OBS-URL: https://build.opensuse.org/package/show/system:install:head/live-langset-data?expand=0&rev=36
This commit is contained in:
Fabian Vogt 2022-11-15 11:01:12 +00:00 committed by Git OBS Bridge
parent 20765f49fc
commit 4926d34a97
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
langset.sh
View File

@ -60,7 +60,6 @@ set_vconsole_option() {
# set_sysconfig_option KEY value # set_sysconfig_option KEY value
set_sysconfig_option() { 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/keyboard
sed -i -e "s#$1=\".*#$1=\"$2\"#" /etc/sysconfig/console sed -i -e "s#$1=\".*#$1=\"$2\"#" /etc/sysconfig/console
} }
@ -70,15 +69,6 @@ set_sysconfig_option() {
[ -z "$CONSOLE_SCREENMAP" ] || set_sysconfig_option CONSOLE_SCREENMAP "$CONSOLE_SCREENMAP" [ -z "$CONSOLE_SCREENMAP" ] || set_sysconfig_option CONSOLE_SCREENMAP "$CONSOLE_SCREENMAP"
[ -z "$CONSOLE_UNICODEMAP" ] || set_sysconfig_option CONSOLE_UNICODEMAP "$CONSOLE_UNICODEMAP" [ -z "$CONSOLE_UNICODEMAP" ] || set_sysconfig_option CONSOLE_UNICODEMAP "$CONSOLE_UNICODEMAP"
# If those are set, locale.conf is ignored - so only set them if necessary (i.e. <= 12 base)
# bsc#1119420
[ -f /usr/lib/os-release ] && . /usr/lib/os-release
[ -f /etc/os-release ] && . /etc/os-release
if [ -n "$VERSION_ID" ] && [ "${VERSION_ID%%.*}" -le 12 ]; then
[ -z "$RC_LANG" ] || set_sysconfig_option RC_LANG "$RC_LANG"
[ -z "$RC_LC_MESSAGES" ] || set_sysconfig_option RC_LC_MESSAGES "$RC_LC_MESSAGES"
fi
[ -z "$KEYTABLE" ] || set_sysconfig_option KEYTABLE "$KEYTABLE" [ -z "$KEYTABLE" ] || set_sysconfig_option KEYTABLE "$KEYTABLE"
[ -z "$COMPOSETABLE" ] || set_sysconfig_option COMPOSETABLE "$COMPOSETABLE" [ -z "$COMPOSETABLE" ] || set_sysconfig_option COMPOSETABLE "$COMPOSETABLE"

6
live-langset-data.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue Nov 15 10:57:55 UTC 2022 - Fabian Vogt <fvogt@suse.com>
- Drop support for /etc/sysconfig/language (12.x), it was activated
in staging projects by accident ("Tumbleweed 1")
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Sep 26 13:54:57 UTC 2022 - Fabian Vogt <fvogt@suse.com> Mon Sep 26 13:54:57 UTC 2022 - Fabian Vogt <fvogt@suse.com>

4
live-langset-data.spec
View File

@ -32,6 +32,10 @@ BuildRequires: systemd-rpm-macros
BuildRequires: yast2-country BuildRequires: yast2-country
# Needed for X11 keyboard data # Needed for X11 keyboard data
BuildRequires: yast2-x11 BuildRequires: yast2-x11
# Support for /etc/sysconfig/language was dropped
%if 0%{?suse_version} < 1500
BuildRequires: newer-distro
%endif
Requires: sed Requires: sed
Requires: systemd Requires: systemd
BuildArch: noarch BuildArch: noarch