58c1d580d9
+- Add 0301-include_sysconfig_language.patch:
- Include /etc/sysconfig/language instead of forcibly generating
/etc/locale.conf
- Workaround and partial fix for boo#927250
OBS-URL: https://build.opensuse.org/request/show/343967
OBS-URL: https://build.opensuse.org/package/show/Base:System/dracut?expand=0&rev=238
40 lines
1.5 KiB
Diff
40 lines
1.5 KiB
Diff
From: Fabian Vogt <fvogt@suse.com>
|
|
Subject: Include /etc/sysconfig/language instead of generating /etc/locale.conf
|
|
References: boo#927250
|
|
|
|
- There's a bug in systemd's locale-setup code, ignoring /etc/locale.conf
|
|
- Work around it by providing /etc/sysconfig/language directly
|
|
- May be the best way to support ROOT_USES_LANG in the initrd properly anyway,
|
|
so this patch can be kept even after the original systemd bug is fixed
|
|
|
|
---
|
|
modules.d/10i18n/module-setup.sh | 8 +++++---
|
|
1 file changed, 5 insertions(+), 3 deletions(-)
|
|
|
|
Index: dracut-043/modules.d/10i18n/module-setup.sh
|
|
===================================================================
|
|
--- dracut-043.orig/modules.d/10i18n/module-setup.sh
|
|
+++ dracut-043/modules.d/10i18n/module-setup.sh
|
|
@@ -25,6 +25,7 @@ install() {
|
|
KBDSUBDIRS=consolefonts,consoletrans,keymaps,unimaps
|
|
DEFAULT_FONT="${i18n_default_font:-LatArCyrHeb-16}"
|
|
I18N_CONF="/etc/locale.conf"
|
|
+ I18N_CONF_SUSE="/etc/sysconfig/language"
|
|
VCONFIG_CONF="/etc/vconsole.conf"
|
|
|
|
# This is from 10redhat-i18n.
|
|
@@ -211,9 +212,10 @@ install() {
|
|
|
|
if dracut_module_included "systemd" && [[ -f ${I18N_CONF} ]]; then
|
|
inst_simple ${I18N_CONF}
|
|
- else
|
|
- mksubdirs ${initdir}${I18N_CONF}
|
|
- print_vars LC_ALL LANG >> ${initdir}${I18N_CONF}
|
|
+ fi
|
|
+
|
|
+ if dracut_module_included "systemd" && [[ -f ${I18N_CONF_SUSE} ]]; then
|
|
+ inst_simple ${I18N_CONF_SUSE}
|
|
fi
|
|
|
|
if dracut_module_included "systemd" && [[ -f ${VCONFIG_CONF} ]]; then
|