<p><br>
On May 29, 2012 12:11 AM, "Dave Reisner" <<a href="mailto:d@falconindy.com">d@falconindy.com</a>> wrote:<br>
><br>
> On Mon, May 28, 2012 at 10:42:00PM +0200, Tom Gundersen wrote:<br>
> > Signed-off-by: Tom Gundersen <<a href="mailto:teg@jklm.no">teg@jklm.no</a>><br>
> > ---<br>
> > functions | 18 ------------------<br>
> > rc.sysinit | 32 +-------------------------------<br>
> > 2 files changed, 1 insertion(+), 49 deletions(-)<br>
> ><br>
> > diff --git a/functions b/functions<br>
> > index 0d488a7..2f03d6a 100644<br>
> > --- a/functions<br>
> > +++ b/functions<br>
> > @@ -658,24 +658,6 @@ if (( RC_FUNCTIONS_HOOK_FUNCS_DEFINED != 1 )); then<br>
> > declare -r RC_FUNCTIONS_HOOK_FUNCS_DEFINED=1<br>
> > fi<br>
> ><br>
> > -# Function for setting console font if required<br>
> > -set_consolefont() {<br>
> > - [[ $CONSOLEFONT ]] || return 0<br>
> > - stat_busy "Loading Console Font: $CONSOLEFONT"<br>
> > - #CONSOLEMAP in UTF-8 shouldn't be used<br>
> > - [[ $CONSOLEMAP && ${LOCALE,,} =~ utf ]] && CONSOLEMAP=""<br>
> > - local i<br>
> > - for i in /dev/tty[0-9]*; do<br>
> > - setfont ${CONSOLEMAP:+-m "${CONSOLEMAP}"} \<br>
> > - "$CONSOLEFONT" -C ${i} &>/dev/null<br>
> > - done<br>
> > - if (( $? )); then<br>
> > - stat_fail<br>
> > - else<br>
> > - stat_done<br>
> > - fi<br>
> > -}<br>
> > -<br>
> > if [[ $DAEMON_LOCALE = [yY][eE][sS] ]]; then<br>
> > export LANG=${LOCALE:-C}<br>
> > if [[ -r /etc/locale.conf ]]; then<br>
> > diff --git a/rc.sysinit b/rc.sysinit<br>
> > index 32313ab..f7743bc 100755<br>
> > --- a/rc.sysinit<br>
> > +++ b/rc.sysinit<br>
> > @@ -75,38 +75,8 @@ if [[ -s /etc/locale.conf ]]; then<br>
> > parse_envfile /etc/locale.conf "LANG"<br>
> > [[ $LANG ]] && LOCALE=$LANG<br>
> > fi<br>
> > -if [[ ${LOCALE,,} =~ utf ]]; then<br>
> > - stat_busy "Setting Consoles to UTF-8 mode"<br>
> > - # UTF-8 consoles are default since 2.6.24 kernel<br>
> > - # this code is needed not only for older kernels,<br>
> > - # but also when user has set vt.default_utf8=0 but LOCALE is *.UTF-8.<br>
> > - for i in /dev/tty[0-9]*; do<br>
> > - kbd_mode -u < ${i}<br>
> > - printf "\e%%G" > ${i}<br>
> > - done<br>
> > - echo 1 >| /sys/module/vt/parameters/default_utf8<br>
> > - stat_done<br>
> > -else<br>
> > - stat_busy "Setting Consoles to legacy mode"<br>
> > - # make non-UTF-8 consoles work on 2.6.24 and newer kernels<br>
> > - for i in /dev/tty[0-9]*; do<br>
> > - kbd_mode -a < ${i}<br>
> > - printf "\e%%@" > ${i}<br>
> > - done<br>
> > - echo 0 >| /sys/module/vt/parameters/default_utf8<br>
> > - stat_done<br>
> > -fi<br>
> > -<br>
> > -if [[ -s /etc/vconsole.conf ]]; then<br>
> > - parse_envfile /etc/vconsole.conf "${vconsolevars[@]}"<br>
> > - [[ $FONT ]] && CONSOLEFONT=$FONT<br>
> > - [[ $FONT_MAP ]] && CONSOLEMAP=$FONT_MAP<br>
> > -fi<br>
> > -[[ $KEYMAP ]] &&<br>
> > - status "Loading Keyboard Map: $KEYMAP" loadkeys -q $KEYMAP<br>
> ><br>
> > -# Set console font if required<br>
> > -set_consolefont<br>
><br>
> Maybe a comment here that systemd-vconsole-setup knows how to read<br>
> /etc/rc.conf.</p>
<p>Yeah, there should be no functional change.</p>
<p>> > +status "Configuring Virtual Console" /usr/lib/systemd/systemd-vconsole-setup<br>
> ><br>
> > # bring up the loopback interface<br>
> > [[ -d /sys/class/net/lo ]] &&<br>
> > --<br>
> > 1.7.10.2<br>
> ><br>
</p>