config: add /etc/vconsole.conf support

Read KEYMAP, CONSOLEFONT and CONSOLEMAP from vconsole.conf. If they are
set they take precedence over the values in rc.conf.

Signed-off-by: Tom Gundersen <teg@jklm.no>

1 files changed, 10 insertions, 0 deletions

diff --git a/rc.sysinit b/rc.sysinit
index dffea4d..415b482 100755
--- a/rc.sysinit
+++ b/rc.sysinit
@@ -237,6 +237,10 @@ if [[ $HOSTNAME ]]; then
 	echo "$HOSTNAME" >| /proc/sys/kernel/hostname && stat_done || stat_fail
 fi
 
+if [[ -s /etc/locale.conf ]]; then
+	. /etc/locale.conf
+	[[ $LANG ]] && LOCALE=$LANG
+fi
 if [[ ${LOCALE,,} =~ utf ]]; then
 	stat_busy "Setting Consoles to UTF-8 mode"
 		# UTF-8 consoles are default since 2.6.24 kernel
@@ -258,6 +262,12 @@ else
 		echo 0 >| /sys/module/vt/parameters/default_utf8
 	stat_done
 fi
+
+if [[ -s /etc/vconsole.conf ]]; then
+	. /etc/vconsole.conf
+	[[ $FONT ]] && CONSOLEFONT=$FONT
+	[[ $FONT_MAP ]] && CONSOLEMAP=$FONT_MAP
+fi
 [[ $KEYMAP ]] &&
 	status "Loading Keyboard Map: $KEYMAP" loadkeys -q $KEYMAP