rc.sysinit: unify modprobe calls

[projects/rc-scripts.git] / setsysfont

diff --git a/setsysfont b/setsysfont
index 3284fb146d2df45bcc9ba48372b71dbd7f44d3fb..7d3a1bd7be3f231e5cfbd8c76b3b5756ef66479f 100755 (executable)
--- a/setsysfont
+++ b/setsysfont
@@ -3,49 +3,50 @@
 #      $Id$
 #
 
-set -x
 [ -f /etc/sysconfig/i18n ] && . /etc/sysconfig/i18n
 [ -f /etc/sysconfig/console ] && . /etc/sysconfig/console
 
-case "$LANG" in
-    *.utf8|*.UTF-8)
-    if [ -x /bin/unicode_start ] && /sbin/consoletype fg ; then
-       exec unicode_start $SYSFONT $SYSFONTACM
-    fi
-    ;;
-esac
+[ -n "$SYSFONT" ] && CONSOLEFONT="$SYSFONT"
+
+
+charmap=
+# /usr might not be mounted
+if [ -x /usr/bin/locale ]; then
+       charmap=$(LANG="$LANG" locale charmap)
+fi
+
+if [ "$charmap" = "UTF-8" ]; then
+       if [ -x /bin/unicode_start ] && /sbin/consoletype fg; then
+               exec unicode_start $CONSOLEFONT $CONSOLEMAP
+       fi
+elif [ -x /bin/unicode_stop ] && /sbin/consoletype fg; then
+       unicode_stop
+fi
 
 # 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
                loadkeys $KEYTABLE < /dev/tty0 > /dev/tty0
        fi
-
-
 # kbd, currently used
 elif [ -x /usr/bin/setfont -o -x /bin/setfont ]; then
-       if [ -n "$CONSOLESCREENFONTMAP" ]; then
+       if [ -n "$CONSOLESCREENFONTMAP" ]; then
                ARGS="-u $CONSOLESCREENFONTMAP"
        fi
        if [ -n "$CONSOLEMAP" ]; then
-               if [ ! -f /lib/kbd/consoletrans/$CONSOLEMAP_to_uni.trans ]; then
-                       CONSOLEMAP=$(echo "$CONSOLEMAP" | sed "s|iso0|8859-|g;s|iso|8859-|g")
+               if [ ! -f /lib/kbd/consoletrans/${CONSOLEMAP}_to_uni.trans ]; then
+                       CONSOLEMAP=$(echo "$CONSOLEMAP" | awk '{ gsub(/iso[0]?/,"8859-"); print $0; }')
                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
+               echo -ne "\033(K" 2>/dev/null > /proc/$$/fd/0
        fi
-else
-       echo "can't set font"
-       exit 1
 fi
+
+exit 0