fix RC_LOGGING=no daemon --makepid --fork write proper pidfile

[projects/rc-scripts.git] / setsysfont

diff --git a/setsysfont b/setsysfont
index 6075158da2e1f058ed3515d5d04b5896c7c563dd..e4f96ab064f0b1485e3c3987e64a89f54ace0b3f 100755 (executable)
--- a/setsysfont
+++ b/setsysfont
@@ -1,37 +1,51 @@
 #!/bin/sh
 #
-#      $Id$
 #
 
 [ -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 -f $SYSFONT
-       elif [ -n "$CONSOLEFONT" ]; then
-               consolechars -m ${CONSOLEMAP:-trivial.trans} -f $CONSOLEFONT
+       if [ -n "$CONSOLEFONT" ]; then
+               consolechars --acm ${CONSOLEMAP:-trivial.trans} --font $CONSOLEFONT
        fi
        if [ -n "$KEYTABLE" ]; then
                loadkeys $KEYTABLE < /dev/tty0 > /dev/tty0
        fi
-
-
-elif [ -x /usr/bin/setfont ]; then
-       if [ -n "$SYSFONT" ]; then
-               /usr/bin/setfont $SYSFONT
-       elif [ -n "$CONSOLEFONT" ]; then
-               /usr/bin/setfont $CONSOLEFONT
+# kbd, currently used
+elif [ -x /usr/bin/setfont -o -x /bin/setfont ]; 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" | awk '{ gsub(/iso[0]?/,"8859-"); print $0; }')
+               fi
+               ARGS="$ARGS -m $CONSOLEMAP"
+       fi
+       if [ -n "$CONSOLEFONT" ]; then
+               setfont $CONSOLEFONT $ARGS
+       else
+               echo -ne "\033(K" 2>/dev/null > /proc/$$/fd/0
        fi
-else
-       echo "can't set font"
-       exit 1
 fi
+
+exit 0