44 lines
1.6 KiB
Diff
44 lines
1.6 KiB
Diff
|
From 64929793cb6f58c865b7d87d241524d9d9cd7a4e Mon Sep 17 00:00:00 2001
|
||
|
|
From: Fabian Vogt <fvogt@suse.com>
|
||
|
|
Date: Tue, 23 Aug 2016 12:56:08 +0200
|
||
|
|
Subject: [PATCH] Include /etc/sysconfig/language instead of generating
|
||
|
|
/etc/locale.conf
|
||
|
|
|
||
|
|
- 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(-)
|
||
|
|
|
||
|
|
diff --git a/modules.d/10i18n/module-setup.sh b/modules.d/10i18n/module-setup.sh
|
||
|
|
index e5bf5eb..d6aab19 100755
|
||
|
|
--- a/modules.d/10i18n/module-setup.sh
|
||
|
|
+++ b/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.
|
||
|
|
@@ -212,9 +213,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
|
||
|
|
--
|
||
|
|
2.6.6
|
||
|
|
|