vconsole: use the systemd tool

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

2 files changed, 1 insertions, 49 deletions

diff --git a/functions b/functions
index fcbe402..99bc43b 100644
--- a/functions
+++ b/functions
@@ -655,24 +655,6 @@ if (( RC_FUNCTIONS_HOOK_FUNCS_DEFINED != 1 )); then
 	declare -r RC_FUNCTIONS_HOOK_FUNCS_DEFINED=1
 fi
 
-# Function for setting console font if required
-set_consolefont() {
-	[[ $CONSOLEFONT ]] || return 0
-	stat_busy "Loading Console Font: $CONSOLEFONT"
-		#CONSOLEMAP in UTF-8 shouldn't be used
-		[[ $CONSOLEMAP && ${LOCALE,,} =~ utf ]] && CONSOLEMAP=""
-		local i
-		for i in /dev/tty[0-9]*; do
-			setfont ${CONSOLEMAP:+-m "${CONSOLEMAP}"} \
-				"$CONSOLEFONT" -C ${i} &>/dev/null
-		done
-	if (( $? )); then
-		stat_fail
-	else
-		stat_done
-	fi
-}
-
 if [[ $DAEMON_LOCALE = [yY][eE][sS] ]]; then
 	export LANG=${LOCALE:-C}
 	if [[ -r /etc/locale.conf ]]; then
diff --git a/rc.sysinit b/rc.sysinit
index 53f0130..5696d89 100755
--- a/rc.sysinit
+++ b/rc.sysinit
@@ -77,38 +77,8 @@ if [[ -s /etc/locale.conf ]]; then
 	parse_envfile /etc/locale.conf "LANG"
 	[[ $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
-		# this code is needed not only for older kernels,
-		# but also when user has set vt.default_utf8=0 but LOCALE is *.UTF-8.
-		for i in /dev/tty[0-9]*; do
-			kbd_mode -u < ${i}
-			printf "\e%%G" > ${i}
-		done
-		echo 1 >| /sys/module/vt/parameters/default_utf8
-	stat_done
-else
-	stat_busy "Setting Consoles to legacy mode"
-		# make non-UTF-8 consoles work on 2.6.24 and newer kernels
-		for i in /dev/tty[0-9]*; do
-			kbd_mode -a < ${i}
-			printf "\e%%@" > ${i}
-		done
-		echo 0 >| /sys/module/vt/parameters/default_utf8
-	stat_done
-fi
-
-if [[ -s /etc/vconsole.conf ]]; then
-	parse_envfile /etc/vconsole.conf "${vconsolevars[@]}"
-	[[ $FONT ]] && CONSOLEFONT=$FONT
-	[[ $FONT_MAP ]] && CONSOLEMAP=$FONT_MAP
-fi
-[[ $KEYMAP ]] &&
-	status "Loading Keyboard Map: $KEYMAP" loadkeys -q $KEYMAP
 
-# Set console font if required
-set_consolefont
+status 'Configuring Virtual Consoles' /usr/lib/systemd/systemd-vconsole-setup
 
 # bring up the loopback interface
 [[ -d /sys/class/net/lo ]] &&