backport some fixesr8-31-6

1 files changed, 7 insertions, 12 deletions

diff --git a/setsysfont b/setsysfont
index ac1a67dd..29d4506c 100755
--- a/setsysfont
+++ b/setsysfont
@@ -12,20 +12,15 @@ case "$LANG" in
       	    exec unicode_start $SYSFONT $SYSFONTACM
 	 fi
 	 ;;
+    *)
+	if /sbin/consoletype fg ; then
+		# no exec, unicode_stop does not set a font
+	        unicode_stop
+	fi
+	;;
 esac
 
-if [ -x /bin/consolechars -o -x /usr/bin/consolechars ]; then
-  if [ -n "$SYSFONT" ]; then
-    ARGS=$SYSFONT
-    if [ -n "$UNIMAP" ]; then
-       ARGS="$ARGS --sfm $UNIMAP"
-    fi
-    if [ -n "$SYSFONTACM" ]; then
-       ARGS="$ARGS --acm $SYSFONTACM"
-    fi
-    consolechars -f $ARGS
-  fi
-elif [ -x /bin/setfont ]; then
+if [ -x /bin/setfont ]; then
   if [ -n "$UNIMAP" ]; then
     ARGS="-u $UNIMAP"
   fi