SVN: rc-scripts/trunk/setsysfont

[glen]

Author: glen
Date: Wed Mar 26 17:20:21 2008
New Revision: 9682

Modified:
   rc-scripts/trunk/setsysfont
Log:
- /usr is not mounted when this is called from rc.sysinit

Modified: rc-scripts/trunk/setsysfont
==============================================================================
--- rc-scripts/trunk/setsysfont	(original)
+++ rc-scripts/trunk/setsysfont	Wed Mar 26 17:20:21 2008
@@ -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 @@
 fi
 
 exit 0
-
-# This must be last line !
-# vi:syntax=sh