Blame 0003-10i18n-parse-i18n.sh-parse-rd.vconsole-and-rd.locale.patch

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