Minimalize code to support SYSFONT, fix UTF-8 handling.

svn-id: @4258

diff --git a/setsysfont b/setsysfont
index 4ee44338080e793fe7feb202819413aea5fd9764..d059a3a60057685710a1ff9823d90fc9ecade75f 100755 (executable)
--- a/setsysfont
+++ b/setsysfont
@@ -6,19 +6,19 @@
 [ -f /etc/sysconfig/i18n ] && . /etc/sysconfig/i18n
 [ -f /etc/sysconfig/console ] && . /etc/sysconfig/console
 
+[ -n "$SYSFONT" ] && CONSOLEFONT="$SYSFONT"
+
 case "$LANG" in
     *.utf8|*.UTF-8)
     if [ -x /bin/unicode_start ] && /sbin/consoletype fg ; then
-       exec unicode_start $SYSFONT $SYSFONTACM
+       exec unicode_start $CONSOLEFONT $CONSOLEMAP
     fi
     ;;
 esac
 
 # console-tools, obsolete part
 if [ -x /usr/bin/consolechars -o -x /bin/consolechars ]; then
-       if [ -n "$SYSFONT" ]; then
-               consolechars --font $SYSFONT
-       elif [ -n "$CONSOLEFONT" ]; then
+       if [ -n "$CONSOLEFONT" ]; then
                consolechars --acm ${CONSOLEMAP:-trivial.trans} --font $CONSOLEFONT
        fi
        if [ -n "$KEYTABLE" ]; then
@@ -37,9 +37,7 @@ elif [ -x /usr/bin/setfont -o -x /bin/setfont ]; then
                fi
                ARGS="$ARGS -m $CONSOLEMAP"
        fi
-       if [ -n "$SYSFONT" ]; then
-               setfont $SYSFONT $ARGS
-       elif [ -n "$CONSOLEFONT" ]; then
+       if [ -n "$CONSOLEFONT" ]; then
                setfont $CONSOLEFONT $ARGS
        else
                echo -ne "\033(K" 2>/dev/null > /proc/$$/fd/0