aboutsummaryrefslogtreecommitdiff
path: root/rc.sysinit
diff options
context:
space:
mode:
authorTom Gundersen <teg@jklm.no>2012-05-14 23:54:25 (GMT)
committerTom Gundersen <teg@jklm.no>2012-05-29 10:48:18 (GMT)
commit854aa04187d4f65607f9b4525ca6645a0db7c9f8 (patch)
tree9d3fb83e92dd7a69b295ceea2076561efd7ee6f3 /rc.sysinit
parent6aae67af18fcb9af1ab47c7dd4bfd9c265f0203b (diff)
downloadinitscripts-854aa04187d4f65607f9b4525ca6645a0db7c9f8.tar.xz
vconsole: use the systemd tool
Signed-off-by: Tom Gundersen <teg@jklm.no>
Diffstat (limited to 'rc.sysinit')
-rwxr-xr-xrc.sysinit32
1 files changed, 1 insertions, 31 deletions
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 ]] &&