aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Nottingham <notting@redhat.com>2003-07-08 20:22:28 +0000
committerBill Nottingham <notting@redhat.com>2003-07-08 20:22:28 +0000
commitbbad0baf36cbe5c58b6f5767ca1370af598b6dd5 (patch)
tree43fc6a826f4c959ae7c1e843e7c41aacfeffdd81
parent9c51f7ea621bd202c58a44a61772acf97c8a48c0 (diff)
downloadinitscripts-bbad0baf36cbe5c58b6f5767ca1370af598b6dd5.tar
initscripts-bbad0baf36cbe5c58b6f5767ca1370af598b6dd5.tar.gz
initscripts-bbad0baf36cbe5c58b6f5767ca1370af598b6dd5.tar.bz2
initscripts-bbad0baf36cbe5c58b6f5767ca1370af598b6dd5.tar.xz
initscripts-bbad0baf36cbe5c58b6f5767ca1370af598b6dd5.zip
check that we're the current foreground console before running
unicode_start
-rwxr-xr-xlang.csh12
-rwxr-xr-xlang.sh2
-rwxr-xr-xsetsysfont2
3 files changed, 9 insertions, 7 deletions
diff --git a/lang.csh b/lang.csh
index 316de43e..333463f7 100755
--- a/lang.csh
+++ b/lang.csh
@@ -75,11 +75,13 @@ if ($sourced == 1) then
if ( "$TERM" == "linux" ) then
if ( `/sbin/consoletype` == "vt" ) then
if ( -x /bin/unicode_start ) then
- if ( $?SYSFONT ) then
- if ( $?SYSFONTACM ) then
- unicode_start $SYSFONT $SYSFONTACM
- else
- unicode_start $SYSFONT
+ if { /sbin/consoletype fg } then
+ if ( $?SYSFONT ) then
+ if ( $?SYSFONTACM ) then
+ unicode_start $SYSFONT $SYSFONTACM
+ else
+ unicode_start $SYSFONT
+ endif
endif
endif
endif
diff --git a/lang.sh b/lang.sh
index dd16e59d..94a3f296 100755
--- a/lang.sh
+++ b/lang.sh
@@ -70,7 +70,7 @@ if [ "$sourced" = 1 ]; then
case $LANG in
*.utf8*|*.UTF-8*)
if [ "$TERM" = "linux" -a "`/sbin/consoletype`" = "vt" ]; then
- [ -x /bin/unicode_start ] && unicode_start $SYSFONT $SYSFONTACM
+ [ -x /bin/unicode_start ] && /sbin/consoletype fg && unicode_start $SYSFONT $SYSFONTACM
fi
;;
esac
diff --git a/setsysfont b/setsysfont
index 828833c6..bcebb719 100755
--- a/setsysfont
+++ b/setsysfont
@@ -8,7 +8,7 @@ fi
case "$LANG" in
*.utf8|*.UTF-8)
- if [ -x /bin/unicode_start ]; then
+ if [ -x /bin/unicode_start ] && /sbin/consoletype fg ; then
exec unicode_start $SYSFONT $SYSFONTACM
fi
;;