On May 29, 2012 12:11 AM, "Dave Reisner" <d@falconindy.com> wrote:
>
> On Mon, May 28, 2012 at 10:42:00PM +0200, Tom Gundersen wrote:
> > Signed-off-by: Tom Gundersen <teg@jklm.no>
> > ---
> >  functions  |   18 ------------------
> >  rc.sysinit |   32 +-------------------------------
> >  2 files changed, 1 insertion(+), 49 deletions(-)
> >
> > diff --git a/functions b/functions
> > index 0d488a7..2f03d6a 100644
> > --- a/functions
> > +++ b/functions
> > @@ -658,24 +658,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 32313ab..f7743bc 100755
> > --- a/rc.sysinit
> > +++ b/rc.sysinit
> > @@ -75,38 +75,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
>
> Maybe a comment here that systemd-vconsole-setup knows how to read
> /etc/rc.conf.

Yeah, there should be no functional change.

> > +status "Configuring Virtual Console" /usr/lib/systemd/systemd-vconsole-setup
> >
> >  # bring up the loopback interface
> >  [[ -d /sys/class/net/lo ]] &&
> > --
> > 1.7.10.2
> >