|
 |
5c6c2a |
From 063d6acb7b7f636e5a5e0369170f91d8961ffcd3 Mon Sep 17 00:00:00 2001
|
|
|
5c6c2a |
From: Harald Hoyer <harald@redhat.com>
|
|
|
5c6c2a |
Date: Tue, 8 Oct 2013 15:02:14 +0200
|
|
|
5c6c2a |
Subject: [PATCH] 10i18n/parse-i18n.sh: parse rd.vconsole and rd.locale
|
|
|
5c6c2a |
|
|
|
5c6c2a |
and removed systemd part, because parse-i18n.sh is not even installed in
|
|
|
5c6c2a |
systemd driven initramfs images.
|
|
|
5c6c2a |
|
|
|
5c6c2a |
Cherry-picked from: 6c8fc6e377b94e26e6d03cddbf174cb27caad0a6
|
|
|
5c6c2a |
Resolves: #1479325
|
|
|
5c6c2a |
---
|
|
|
5c6c2a |
modules.d/10i18n/parse-i18n.sh | 22 ++++++++--------------
|
|
|
5c6c2a |
1 file changed, 8 insertions(+), 14 deletions(-)
|
|
|
5c6c2a |
|
|
|
5c6c2a |
diff --git a/modules.d/10i18n/parse-i18n.sh b/modules.d/10i18n/parse-i18n.sh
|
|
|
5c6c2a |
index 348c5bc8..416a7469 100755
|
|
|
5c6c2a |
--- a/modules.d/10i18n/parse-i18n.sh
|
|
|
5c6c2a |
+++ b/modules.d/10i18n/parse-i18n.sh
|
|
|
5c6c2a |
@@ -19,24 +19,18 @@ inst_key_val() {
|
|
|
5c6c2a |
unset _value
|
|
|
5c6c2a |
}
|
|
|
5c6c2a |
|
|
|
5c6c2a |
-inst_key_val '' /etc/vconsole.conf vconsole.keymap KEYMAP -d KEYTABLE
|
|
|
5c6c2a |
-inst_key_val '' /etc/vconsole.conf vconsole.font FONT -d SYSFONT
|
|
|
5c6c2a |
-inst_key_val '' /etc/vconsole.conf vconsole.font.map FONT_MAP -d CONTRANS
|
|
|
5c6c2a |
-inst_key_val '' /etc/vconsole.conf vconsole.font.unimap FONT_UNIMAP -d UNIMAP
|
|
|
5c6c2a |
-inst_key_val 1 /etc/vconsole.conf vconsole.font.unicode UNICODE vconsole.unicode
|
|
|
5c6c2a |
-inst_key_val '' /etc/vconsole.conf vconsole.keymap.ext EXT_KEYMAP
|
|
|
5c6c2a |
+inst_key_val '' /etc/vconsole.conf rd.vconsole.keymap vconsole.keymap KEYMAP -d KEYTABLE
|
|
|
5c6c2a |
+inst_key_val '' /etc/vconsole.conf rd.vconsole.font vconsole.font FONT -d SYSFONT
|
|
|
5c6c2a |
+inst_key_val '' /etc/vconsole.conf rd.vconsole.font.map vconsole.font.map FONT_MAP -d CONTRANS
|
|
|
5c6c2a |
+inst_key_val '' /etc/vconsole.conf rd.vconsole.font.unimap vconsole.font.unimap FONT_UNIMAP -d UNIMAP
|
|
|
5c6c2a |
+inst_key_val 1 /etc/vconsole.conf rd.vconsole.font.unicode vconsole.font.unicode UNICODE vconsole.unicode
|
|
|
5c6c2a |
+inst_key_val '' /etc/vconsole.conf rd.vconsole.keymap.ext vconsole.keymap.ext EXT_KEYMAP
|
|
|
5c6c2a |
|
|
|
5c6c2a |
-inst_key_val '' /etc/locale.conf locale.LANG LANG
|
|
|
5c6c2a |
-inst_key_val '' /etc/locale.conf locale.LC_ALL LC_ALL
|
|
|
5c6c2a |
+inst_key_val '' /etc/locale.conf rd.locale.LANG locale.LANG LANG
|
|
|
5c6c2a |
+inst_key_val '' /etc/locale.conf rd.locale.LC_ALL locale.LC_ALL LC_ALL
|
|
|
5c6c2a |
|
|
|
5c6c2a |
if [ -f /etc/locale.conf ]; then
|
|
|
5c6c2a |
. /etc/locale.conf
|
|
|
5c6c2a |
export LANG
|
|
|
5c6c2a |
export LC_ALL
|
|
|
5c6c2a |
fi
|
|
|
5c6c2a |
-
|
|
|
5c6c2a |
-if [ -n "$DRACUT_SYSTEMD" ]; then
|
|
|
5c6c2a |
- rm -f -- /etc/udev/rules.d/10-console.rules
|
|
|
5c6c2a |
- rm -f -- /lib/udev/rules.d/10-console.rules
|
|
|
5c6c2a |
- rm -f -- /lib/udev/console_init
|
|
|
5c6c2a |
-fi
|