--- trunk/grubby/new-kernel-pkg	2016/06/30 10:39:38	2996
+++ trunk/grubby/new-kernel-pkg	2017/06/27 14:22:13	3004
@@ -924,49 +924,22 @@
 fi
 [[ -n ${verbose} ]] && echo "devtreedir is ${devtreedir}"
 
-# add dracut i18n, keyboard and plymouth kernel args if requested
-if [[ -n ${dracut} ]] || [[ -n ${adddracutargs} ]]
-then
-	if [ -r /etc/vconsole.conf ]
-	then
-		. /etc/vconsole.conf
-
-		for i in SYSFONT SYSFONTACM UNIMAP KEYTABLE
-		do 
-			val=$(eval echo \$$i)
-			[[ -n ${val} ]] && kernargs="${kernargs} ${i}=${val}"
-		done
-	else
-		if [ -r /etc/conf.d/consolefont ]
-		then
-			. /etc/conf.d/consolefont
-
-			if [[ -n ${CONSOLEFONT} ]]
-			then
-				kernargs="${kernargs} SYSFONT=${CONSOLEFONT}"
-			fi
-		fi
-
-		if  [ -r /etc/conf.d/keymap ]
-		then
-			. /etc/conf.d/keymap 
-
-			if [[ -n ${KEYMAP} ]]
-			then
-				kernargs="${kernargs} KEYTABLE=${KEYMAP}"
-			fi
-		fi
-	fi
-
-	if [ -r /etc/locale.conf ]
-	then
-		. /etc/locale.conf
-
-		if [[ -n ${LANG} ]]
-		then
-			kernargs="${kernargs} LANG=${LANG}"
-		fi
-	fi
+# add dracut kernel args if requested
+if [[ -n ${dracut} ]] && [[ -n ${adddracutargs} ]]
+	[ -r /etc/vconsole.conf ] && . /etc/vconsole.conf
+	[ -r /etc/locale.conf ] && . /etc/locale.conf
+
+	while read opt rd_opt
+	do
+		[ -n "${!opt}" ] && kernargs="$kernargs $rd_opt=\"${!opt}\""
+	done <<< 'KEYMAP	rd.vconsole.keymap
+			FONT	rd.vconsole.font
+			FONT_MAP	rd.vconsole.font.map
+			FONT_UNIMAP	rd.vconsole.font.unimap
+			UNICODE	rd.vconsole.font.unicode
+			EXT_KEYMAP	rd.vconsole.keymap.ext
+			LANG	rd.locale.LANG
+			LC_ALL	rd.locale.LC_ALL'
 fi
 
 # set this as the default if we have the package and it matches