|
 |
24fce8 |
From a8fd0f15979d5f4632c337c8bcfbdbae2b957f67 Mon Sep 17 00:00:00 2001
|
|
|
24fce8 |
From: marcosfrm <marcosfrm@users.noreply.github.com>
|
|
|
24fce8 |
Date: Tue, 6 Oct 2015 08:29:02 -0300
|
|
|
24fce8 |
Subject: [PATCH 17/55] Fix dracut cmdline options and conditionalize them to
|
|
|
24fce8 |
--add-dracut-args
|
|
|
24fce8 |
|
|
|
24fce8 |
By default initramfs generated by dracut is HostOnly and has vconsole.conf and locale.conf included. Instead of killing this import section, conditionalize it to --add-dracut-args.
|
|
|
24fce8 |
|
|
|
24fce8 |
Reference: http://git.kernel.org/cgit/boot/dracut/dracut.git/tree/modules.d/10i18n/parse-i18n.sh
|
|
|
24fce8 |
---
|
|
|
24fce8 |
new-kernel-pkg | 35 ++++++++++++++---------------------
|
|
|
24fce8 |
1 file changed, 14 insertions(+), 21 deletions(-)
|
|
|
24fce8 |
|
|
|
24fce8 |
diff --git a/new-kernel-pkg b/new-kernel-pkg
|
|
|
24fce8 |
index 90652da06b7..997fb1f4987 100755
|
|
|
24fce8 |
--- a/new-kernel-pkg
|
|
|
24fce8 |
+++ b/new-kernel-pkg
|
|
|
24fce8 |
@@ -825,28 +825,21 @@ if [[ ${ARCH} =~ armv[5|7].*l ]]; then
|
|
|
24fce8 |
fi
|
|
|
24fce8 |
[ -n "$verbose" ] && echo "devtreedir is $devtreedir"
|
|
|
24fce8 |
|
|
|
24fce8 |
-# add dracut i18n, keyboard and plymouth kernel args if requested
|
|
|
24fce8 |
-if [ -n "$dracut" -o -n "$adddracutargs" ]; then
|
|
|
24fce8 |
- if [ -r /etc/vconsole.conf ]; then
|
|
|
24fce8 |
- . /etc/vconsole.conf
|
|
|
24fce8 |
- elif [ -r /etc/sysconfig/keyboard ]; then
|
|
|
24fce8 |
- . /etc/sysconfig/keyboard
|
|
|
24fce8 |
- fi
|
|
|
24fce8 |
+# add dracut kernel args if requested
|
|
|
24fce8 |
+if [ -n "$dracut" -a -n "$adddracutargs" ]; then
|
|
|
24fce8 |
+ [ -r /etc/vconsole.conf ] && . /etc/vconsole.conf
|
|
|
24fce8 |
+ [ -r /etc/locale.conf ] && . /etc/locale.conf
|
|
|
24fce8 |
|
|
|
24fce8 |
- if [ -r /etc/locale.conf ]; then
|
|
|
24fce8 |
- . /etc/locale.conf
|
|
|
24fce8 |
- elif [ -r /etc/sysconfig/i18n ]; then
|
|
|
24fce8 |
- . /etc/sysconfig/i18n
|
|
|
24fce8 |
- fi
|
|
|
24fce8 |
-
|
|
|
24fce8 |
- for i in SYSFONT SYSFONTACM UNIMAP LANG KEYTABLE; do
|
|
|
24fce8 |
- val=$(eval echo \$$i)
|
|
|
24fce8 |
- [ -n "$val" ] && kernargs="$kernargs $i=$val"
|
|
|
24fce8 |
- done
|
|
|
24fce8 |
-
|
|
|
24fce8 |
- if [ -n "$KEYBOARDTYPE" -a "$KEYBOARDTYPE" != "pc" ]; then
|
|
|
24fce8 |
- kernargs="$kernargs KEYBOARDTYPE=$KEYBOARDTYPE"
|
|
|
24fce8 |
- fi
|
|
|
24fce8 |
+ while read opt rd_opt; do
|
|
|
24fce8 |
+ [ -n "${!opt}" ] && kernargs="$kernargs $rd_opt=\"${!opt}\""
|
|
|
24fce8 |
+ done <<< 'KEYMAP rd.vconsole.keymap
|
|
|
24fce8 |
+ FONT rd.vconsole.font
|
|
|
24fce8 |
+ FONT_MAP rd.vconsole.font.map
|
|
|
24fce8 |
+ FONT_UNIMAP rd.vconsole.font.unimap
|
|
|
24fce8 |
+ UNICODE rd.vconsole.font.unicode
|
|
|
24fce8 |
+ EXT_KEYMAP rd.vconsole.keymap.ext
|
|
|
24fce8 |
+ LANG rd.locale.LANG
|
|
|
24fce8 |
+ LC_ALL rd.locale.LC_ALL'
|
|
|
24fce8 |
fi
|
|
|
24fce8 |
|
|
|
24fce8 |
# set this as the default if we have the package and it matches
|
|
|
24fce8 |
--
|
|
|
24fce8 |
2.17.1
|
|
|
24fce8 |
|