Marcus Meissner
0f203926a1
- Rename patch:
* From 0211-fix_multipath_check_hostonly.patch
to 0303-fix_multipath_check_hostonly.patch
- Rename patch:
* From 0213-10i18n-keymap-find.patch
to 0213-Fix-wrong-keymap-inclusion.patch
- 95fcoe: Do not complain about missing /etc/hba.conf (bsc#980539)
* Add 0215-95fcoe-Do-not-complain-about-missing-etc-hba.conf.patch
- 95fcoe: silence lldpad warnings
* Add 0216-95fcoe-silence-lldpad-warnings.patch
- 95fcoe: Allow to specify the FCoE mode via the fcoe= parameter
* Add 0217-95fcoe-Allow-to-specify-the-FCoE-mode-via-the-fcoe-p.patch
- 40network: allow persistent interface names (bsc#995284)
* Add 0218-40network-allow-persistent-interface-names.patch
- 95fcoe: use interface names instead of MAC addresses
* Add 0219-95fcoe-use-interface-names-instead-of-MAC-addresses.patch
- 95fcoe: always set AUTO_VLAN for fcoemon (bsc#995019)
* Add 0220-95fcoe-always-set-AUTO_VLAN-for-fcoemon.patch
- 95fcoe: Add shutdown script (bsc#994860)
* Add 0221-95fcoe-Add-shutdown-script.patch
- 90dm: Fixup shutdown script (bsc#994860)
* Add 0222-90dm-Fixup-shutdown-script.patch
- 90dm: fixup dependency cycle between MD and DM shutdown (bsc#994860)
* Add 0223-90dm-fixup-dependency-cycle-between-MD-and-DM-shutdo.patch
- 90multipath: Start daemon after udev settle (bsc#986734)
* Add 0304-90multipath-Start-daemon-after-udev-settle.patch
- 90multipath: load dm_multipath module during startup
* Add 0305-90multipath-load-dm_multipath-module-during-startup.patch
- 90multipath: add shutdown script (bsc#994860)
OBS-URL: https://build.opensuse.org/request/show/422869
OBS-URL: https://build.opensuse.org/package/show/Base:System/dracut?expand=0&rev=263
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
|
|
|