--- trunk/initscripts/sysvinit/rc/consolefont	2011/06/04 21:05:01	1356
+++ trunk/initscripts/sysvinit/rc/consolefont	2013/01/24 15:21:11	2035
@@ -13,21 +13,25 @@
 source /etc/conf.d/rc
 source ${rc_functions}
 
-[ -f /etc/conf.d/consolefont ] && source /etc/conf.d/consolefont
+[ -f /etc/vconsole.conf ] && source /etc/vconsole.conf
 
 # some defaults
-[ -z "${CONSOLEFONT}" ] && CONSOLEFONT="default8x16"
+SETFONT_OPTS=""
+[ -z "${FONT}" ] && CONSOLEFONT="default8x16"
+
+# load font maps too
+[ -n "${FONT_MAP} ] && SETFONT_OPTS="${SETFONT_OPTS} -m ${FONT_MAP}"
+[ -n "${FONT_UNIMAP} ] && SETFONT_OPTS="${SETFONT_OPTS} -u ${FONT_UNIMAP}"
 
 if [ -x /bin/setfont ]
 then
-	rc_print "Setting console font to ${CONSOLEFONT} ..."
+	rc_print "Setting console font to ${FONT} ..."
 	for i in 0 1 2 3 4 5 6
 	do
-		/bin/setfont ${CONSOLEFONT} -C /dev/tty${i}
+		/bin/setfont ${SETFONT_OPTS} ${FONT} -C /dev/tty${i}
 	done
 	evaluate_retval
 fi
 
 update_svcstatus $1
 splash svc_started "$(basename $0)" 0
-