aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBernhard Rosenkraenzer <bero@redhat.com>2001-05-02 18:18:39 +0000
committerBernhard Rosenkraenzer <bero@redhat.com>2001-05-02 18:18:39 +0000
commit35508daef7422017d2c47e5f18a7bce0bd4d4cfb (patch)
treef0cf1bd033ca14ae8f8072fca34c812aeea80f90
parent2309f306da2fc2b9d77472d456727f9e468f0fda (diff)
downloadinitscripts-35508daef7422017d2c47e5f18a7bce0bd4d4cfb.tar
initscripts-35508daef7422017d2c47e5f18a7bce0bd4d4cfb.tar.gz
initscripts-35508daef7422017d2c47e5f18a7bce0bd4d4cfb.tar.bz2
initscripts-35508daef7422017d2c47e5f18a7bce0bd4d4cfb.tar.xz
initscripts-35508daef7422017d2c47e5f18a7bce0bd4d4cfb.zip
Handle kbd-1.05
-rwxr-xr-xsetsysfont31
1 files changed, 12 insertions, 19 deletions
diff --git a/setsysfont b/setsysfont
index 30a0b8bc..330e8fe7 100755
--- a/setsysfont
+++ b/setsysfont
@@ -6,25 +6,18 @@ if [ -f /etc/sysconfig/i18n ]; then
. /etc/sysconfig/i18n
fi
-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 /usr/bin/setfont ]; then
- if [ -n "$SYSFONT" -a -n "$UNIMAP" ]; then
- /usr/bin/setfont $SYSFONT -u $UNIMAP
- elif [ -n "$SYSFONT" ]; then
- /usr/bin/setfont $SYSFONT
-# else
-# /usr/bin/setfont
- fi
+[ -z "$SYSFONT" ] && exit 0
+
+if [ -x /bin/setfont -o -x /usr/bin/setfont ]; then
+ PARMS="$SYSFONT"
+ [ -n "$UNIMAP" ] && PARMS="$PARMS -n $UNIMAP"
+ [ -n "$CHARSET" ] && PARMS="$PARMS -m $CHARSET"
+ setfont $PARMS
+elif [ -x /bin/consolechars -o -x /usr/bin/consolechars ]; then
+ ARGS="$SYSFONT"
+ [ -n "$UNIMAP" ] && ARGS="$ARGS --sfm $UNIMAP"
+ [ -n "$SYSFONTACM" ] && ARGS="$ARGS --acm $SYSFONTACM"
+ consolechars -f $ARGS
else
echo $"can't set font"
exit 1