rc.sysinit: unify modprobe calls

[projects/rc-scripts.git] / setsysfont

diff --git a/setsysfont b/setsysfont
index a3a823fb0aaca75c60c411829beef84fb9351024..7d3a1bd7be3f231e5cfbd8c76b3b5756ef66479f 100755 (executable)
--- a/setsysfont
+++ b/setsysfont
@@ -8,11 +8,18 @@
 
 [ -n "$SYSFONT" ] && CONSOLEFONT="$SYSFONT"
 
-if [ "$(LANG="$LANG" locale charmap)" = "UTF-8" ]; then
-       if [ -x /bin/unicode_start ] && /sbin/consoletype fg ; then
+
+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
+elif [ -x /bin/unicode_stop ] && /sbin/consoletype fg; then
        unicode_stop
 fi
 
@@ -43,6 +50,3 @@ elif [ -x /usr/bin/setfont -o -x /bin/setfont ]; then
 fi
 
 exit 0
-
-# This must be last line !
-# vi:syntax=sh