From 58c1d580d931cbe32e114075e97fc0c218034beebfa4fcc77f42f844906e5cd3 Mon Sep 17 00:00:00 2001
From: Thomas Renninger <trenn@suse.com>
Date: Thu, 12 Nov 2015 10:15:55 +0000
Subject: [PATCH] Accepting request 343967 from
 home:favogt:branches:Base:System

+- 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
---
 0301-include_sysconfig_language.patch | 39 +++++++++++++++++++++++++++
 dracut.changes                        |  8 ++++++
 dracut.spec                           |  3 +++
 3 files changed, 50 insertions(+)
 create mode 100644 0301-include_sysconfig_language.patch

diff --git a/0301-include_sysconfig_language.patch b/0301-include_sysconfig_language.patch
new file mode 100644
index 0000000..5206fca
--- /dev/null
+++ b/0301-include_sysconfig_language.patch
@@ -0,0 +1,39 @@
+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
diff --git a/dracut.changes b/dracut.changes
index 71f9528..0ee0147 100644
--- a/dracut.changes
+++ b/dracut.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Thu Nov 12 08:52:54 UTC 2015 - fvogt@localhost
+
+- Add 0301-include_sysconfig_language.patch:
+    - Include /etc/sysconfig/language instead of forcibly generating
+        /etc/locale.conf
+    - Workaround and partial fix for boo#927250
+
 -------------------------------------------------------------------
 Tue Nov 10 11:26:51 UTC 2015 - fvogt@suse.com
 
diff --git a/dracut.spec b/dracut.spec
index 590b9cb..17040d0 100644
--- a/dracut.spec
+++ b/dracut.spec
@@ -125,7 +125,9 @@ Patch205:       0205-mdraid_ignore_hostonly.patch
 
 ## fix for SUSE systems which have dpkg installed anyway
 Patch300:       dracut_dont_use_dpkg_defaults_on_SUSE.patch
+Patch301:       0301-include_sysconfig_language.patch
 
+# New features/improvements
 Patch400:       0400-use_fstab_systemd.patch
 Patch401:       0401-mount_option_mountpoint.patch
 Patch402:       0402-driver-fail-summary.patch
@@ -271,6 +273,7 @@ chmod a+x modules.d/91zipl/install_zipl_cmdline.sh
 %patch205 -p1
 
 %patch300 -p1
+%patch301 -p1
 
 %patch400 -p1
 %patch401 -p1