Browse Source

wscons rc files are not nicely MI clean, so when some nice diffs are shown around, they can go back in

OPENBSD_2_9
deraadt 23 years ago
parent
commit
31e89bc9bd
3 changed files with 1 additions and 152 deletions
  1. +1
    -6
      src/etc/rc
  2. +0
    -117
      src/etc/rc.wscons
  3. +0
    -29
      src/etc/wscons.conf

+ 1
- 6
src/etc/rc View File

@ -1,4 +1,4 @@
# $OpenBSD: rc,v 1.165 2001/03/02 06:22:39 deraadt Exp $
# $OpenBSD: rc,v 1.166 2001/04/01 19:39:54 deraadt Exp $
# System startup script run by init on autoboot # System startup script run by init on autoboot
# or after single-user. # or after single-user.
@ -548,11 +548,6 @@ echo -n ' cron'; cron
echo '.' echo '.'
if [ -f /etc/rc.wscons -a -f /etc/wscons.conf ]; then
echo configuring wscons
/bin/sh /etc/rc.wscons
fi
date date
if [ "X${moused_flags}" != X"NO" -a -x /usr/sbin/moused ]; then if [ "X${moused_flags}" != X"NO" -a -x /usr/sbin/moused ]; then


+ 0
- 117
src/etc/rc.wscons View File

@ -1,117 +0,0 @@
# $OpenBSD: rc.wscons,v 1.2 2001/02/12 04:26:33 deraadt Exp $
# $NetBSD: rc.wscons,v 1.3 1999/05/15 14:28:14 drochner Exp $
wscfg=/usr/sbin/wsconscfg
wsfld=/usr/sbin/wsfontload
config=/etc/wscons.conf
usage="Usage: wsconfig [-n] [-f configfile] [-font fontpgm] [-screen screenpgm]"
DOIT=
while [ $# -gt 0 ]; do
case $1 in
-n)
DOIT=echo
;;
-f)
config=$2
shift
;;
-font)
wsfld=$2
shift
;;
-screen)
wscfg=$2
shift
;;
*)
echo $usage
exit 1
;;
esac
shift
done
# args mean:
# screen idx scr emul
# font name width height enc file
( while read type arg1 arg2 arg3 arg4 arg5; do
case "$type" in
\#*|"")
continue
;;
font)
name=$arg1
width=$arg2
height=$arg3
enc=$arg4
file=$arg5
cmd=$wsfld
case $width in
-)
;;
*)
cmd="$cmd -w $width"
;;
esac
case $height in
-)
;;
*)
cmd="$cmd -h $height"
;;
esac
case $enc in
-)
;;
*)
cmd="$cmd -e $enc"
;;
esac
cmd="$cmd -N $name $file"
eval $DOIT $cmd
;;
screen)
idx=$arg1
scr=$arg2
emul=$arg3
cmd=$wscfg
case $scr in
-)
;;
*)
cmd="$cmd -t $scr"
;;
esac
case $emul in
-)
;;
*)
cmd="$cmd -e $emul"
;;
esac
cmd="$cmd $idx"
eval $DOIT $cmd
;;
keyboard)
kbd=$arg1
cmd=$wscfg
case $kbd in
-|auto)
cmd="$cmd -k"
;;
*)
cmd="$cmd -k $kbd"
;;
esac
eval $DOIT $cmd
;;
mux)
cmd="$wscfg -m $arg1"
eval $DOIT $cmd
;;
esac
done ) < $config

+ 0
- 29
src/etc/wscons.conf View File

@ -1,29 +0,0 @@
# $OpenBSD: wscons.conf,v 1.1 2001/02/10 17:51:47 mickey Exp $
# $NetBSD: wscons.conf,v 1.4 1999/07/29 19:26:08 augustss Exp $
#
# workstation console configuration
# fonts to load
# name width height enc file
#font ibm - 8 ibm /usr/share/pcvt/fonts/vt220l.808
# Note: "pcvt" encoded fonts are only useful with the "*bf" screen types
# of the "vga" driver. The kernel must be compiled with the option
# "WSCONS_SUPPORT_PCVTFONTS" turned on. See vga(4).
#font pcvt - - pcvt /usr/share/pcvt/fonts/vt220h.816
#font pcvt - 8 pcvt /usr/share/pcvt/fonts/vt220h.808
# screens to create
# idx screen emul
# Screen 0 is already configured as console in most cases.
# Uncomment if a serial console is used.
#screen 0 - vt100
screen 1 - vt100
screen 2 - vt100
screen 3 - vt100
screen 4 - -
#screen 4 80x25bf vt100
#screen 5 80x50 vt100
#keyboard auto
mux 1

Loading…
Cancel
Save