diff options
-rw-r--r-- | etc/etc.alpha/MAKEDEV | 32 | ||||
-rw-r--r-- | etc/etc.alpha/fbtab | 2 | ||||
-rw-r--r-- | etc/etc.alpha/ttys | 12 | ||||
-rw-r--r-- | etc/etc.i386/fbtab | 1 | ||||
-rw-r--r-- | etc/etc.powerpc/MAKEDEV | 22 | ||||
-rw-r--r-- | etc/etc.powerpc/fbtab | 2 | ||||
-rw-r--r-- | etc/etc.powerpc/ttys | 4 |
7 files changed, 38 insertions, 37 deletions
diff --git a/etc/etc.alpha/MAKEDEV b/etc/etc.alpha/MAKEDEV index 5ae5bcc8654..e5bf4cc906c 100644 --- a/etc/etc.alpha/MAKEDEV +++ b/etc/etc.alpha/MAKEDEV @@ -1,5 +1,5 @@ #!/bin/sh - -# $OpenBSD: MAKEDEV,v 1.48 2000/09/13 22:12:39 ericj Exp $ +# $OpenBSD: MAKEDEV,v 1.49 2001/01/30 08:34:09 deraadt Exp $ # $NetBSD: MAKEDEV,v 1.8.4.1 1996/06/18 00:41:56 cgd Exp $ # # Copyright (c) 1990 The Regents of the University of California. @@ -52,8 +52,8 @@ # # Terminal ports: # ttyB? DEC 3000 ZS8530 ("scc") serial ports -# ttyC? AlphaStation NS16550 ("com") serial ports -# ttyE? Workstation console ("wscons") tty emulators +# tty0? AlphaStation NS16550 ("com") serial ports +# ttyC? Workstation console ("wscons") tty emulators # # Pseudo terminals: # pty* set of 16 master and slave pseudo terminals @@ -149,12 +149,12 @@ all) sh $this ccd0 ccd1 ccd2 ccd3 wd0 wd1 wd2 wd3 sh $this bpf0 bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9 sh $this tun0 tun1 tun2 tun3 - sh $this ttyB0 ttyB1 ttyC0 ttyC1 lkm + sh $this ttyB0 ttyB1 tty00 tty01 lkm sh $this mmclock lpa0 lpt0 random ipl sh $this uk0 uk1 ss0 ss1 sh $this ttyc0 ttyc1 ttyc2 ttyc3 ttyc4 ttyc5 ttyc6 ttyc7 sh $this local xfs0 - sh $this wscons ttyEcfg + sh $this wscons ttyCcfg ;; raminst) @@ -162,16 +162,16 @@ raminst) sh $this sd0 sd1 sd2 wd0 st0 sh $this cd0 sh $this rd0 bpf0 - sh $this ttyB0 ttyB1 ttyC0 ttyC1 ttyE0 ttyE1 pty0 + sh $this ttyB0 ttyB1 tty00 tty01 ttyC0 ttyC1 pty0 sh $this wsmouse0 wskbd0 - sh $this ttyEcfg + sh $this ttyCcfg ;; wscons) - sh $this ttyE0 ttyE1 ttyE2 ttyE3 ttyE4 ttyE5 ttyE6 ttyE7 + sh $this ttyC0 ttyC1 ttyC2 ttyC3 ttyC4 ttyC5 ttyC6 ttyC7 sh $this wsmouse0 wsmouse1 wsmouse2 wsmouse3 sh $this wskbd0 wskbd1 wskbd2 wskbd3 - sh $this ttyEcfg wsmux + sh $this ttyCcfg wsmux ;; wsmux|wskbd|wsmouse) @@ -316,28 +316,28 @@ cd*) umask 77 ;; -ttyEcfg) +ttyCcfg) rm -f $i mknod $i c 25 255 chown root:wheel $i ;; -ttyE*) - type=E - unit=${i##ttyE} +ttyC*) + type=C + unit=${i##ttyC} case $type in - E) major=25; minor=$unit ;; + C) major=25; minor=$unit ;; esac rm -f tty$type$unit mknod tty$type$unit c $major $minor chown root.wheel tty$type$unit ;; -ttyB*|ttyC*|ttyc*) +ttyB*|tty0*|ttyc*) unit=${i##tty?} case $i in ttyB*) type=B; major=15; minor=`mult $unit 2`;; - ttyC*) type=C; major=26; minor=$unit ;; + tty0*) type=0; major=26; minor=$unit ;; ttyc*) type=c; major=38; minor=$unit ;; esac rm -f tty$type$unit cua$type$unit diff --git a/etc/etc.alpha/fbtab b/etc/etc.alpha/fbtab index b88b77b29eb..75f3c9aaf24 100644 --- a/etc/etc.alpha/fbtab +++ b/etc/etc.alpha/fbtab @@ -1 +1 @@ -/dev/ttyE0 0600 /dev/wsmouse:/dev/wskbd:/dev/ttyE0 +/dev/ttyC0 0600 /dev/console:/dev/wsmouse:/dev/wskbd diff --git a/etc/etc.alpha/ttys b/etc/etc.alpha/ttys index b0f1354e98a..fc3fa7af000 100644 --- a/etc/etc.alpha/ttys +++ b/etc/etc.alpha/ttys @@ -1,5 +1,5 @@ # -# $OpenBSD: ttys,v 1.8 2000/09/09 04:50:40 ericj Exp $ +# $OpenBSD: ttys,v 1.9 2001/01/30 08:34:09 deraadt Exp $ # # name getty type status comments @@ -10,13 +10,13 @@ console "/usr/libexec/getty std.9600" vt100 on secure # Workstation console (framebuffer) ttys -ttyE0 "/usr/libexec/getty std.9600" vt100 off secure -ttyE1 "/usr/libexec/getty std.9600" vt100 off secure +ttyC0 "/usr/libexec/getty std.9600" vt100 off secure +ttyC1 "/usr/libexec/getty std.9600" vt100 off secure # DEC 3000 Z8530 ("scc") serial ports ttyB0 "/usr/libexec/getty std.9600" unknown off secure -ttyB1 "/usr/libexec/getty std.9600" unknown off secure +ttyB1 "/usr/libexec/getty std.9600" unknown off # AlphaStation NS16550 ("com") serial ports -ttyC0 "/usr/libexec/getty std.9600" unknown off secure -ttyC1 "/usr/libexec/getty std.9600" unknown off secure +tty00 "/usr/libexec/getty std.9600" unknown off secure +tty01 "/usr/libexec/getty std.9600" unknown off diff --git a/etc/etc.i386/fbtab b/etc/etc.i386/fbtab index 3a2ee056738..ff0a3db93ad 100644 --- a/etc/etc.i386/fbtab +++ b/etc/etc.i386/fbtab @@ -1 +1,2 @@ /dev/ttyC0 0600 /dev/console +/dev/ttyC0 0600 /dev/console:/dev/wskbd0:/dev/wsmouse0 diff --git a/etc/etc.powerpc/MAKEDEV b/etc/etc.powerpc/MAKEDEV index 0bd0f8b682e..6173478734e 100644 --- a/etc/etc.powerpc/MAKEDEV +++ b/etc/etc.powerpc/MAKEDEV @@ -1,5 +1,5 @@ #!/bin/sh - -# $OpenBSD: MAKEDEV,v 1.35 2001/01/30 03:02:21 drahn Exp $ +# $OpenBSD: MAKEDEV,v 1.36 2001/01/30 08:34:09 deraadt Exp $ # # Copyright (c) 1990 The Regents of the University of California. # All rights reserved. @@ -45,7 +45,7 @@ # raid* RAIDframe disk devices # # Terminal ports: -# ttyE* wscons +# ttyC* wscons # tty* standard built-in serial ports (2) # # Pointing devices: @@ -153,7 +153,7 @@ all) sh $this ccd0 ccd1 ccd2 ccd3 sh $this raid0 raid1 raid2 raid3 sh $this rd0 ipl - sh $this ttyo0 ttyE0 ttyEcfg + sh $this ttyo0 ttyC0 ttyCcfg sh $this tty00 tty01 tty02 tty03 pty0 pty1 sh $this bpf0 bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9 sh $this tun0 tun1 tun2 tun3 @@ -493,17 +493,17 @@ utty*) ;; -ttyEcfg) +ttyCcfg) major=67 minor=255 - rm -f ttyEcfg - mknod ttyEcfg c $major $minor - chown root.wheel ttyEcfg + rm -f ttyCcfg + mknod ttyCcfg c $major $minor + chown root.wheel ttyCcfg ;; -ttyE*) - type=E - unit=${i##ttyE} +ttyC*) + type=C + unit=${i##ttyC} major=67 minor=$unit rm -f tty$type$unit @@ -585,7 +585,7 @@ ss*) ;; wscons*) unit=${i##*[a-z]} - sh $this ttyE${unit} wskbd${unit} wsmouse${unit} + sh $this ttyC${unit} wskbd${unit} wsmouse${unit} ;; wskbd*) unit=${i##*[a-z]} diff --git a/etc/etc.powerpc/fbtab b/etc/etc.powerpc/fbtab index b51f9779676..e03a9d2b93b 100644 --- a/etc/etc.powerpc/fbtab +++ b/etc/etc.powerpc/fbtab @@ -1,4 +1,4 @@ /dev/ttya 0600 /dev/console /dev/tty00 0600 /dev/console /dev/ttyo0 0600 /dev/console -/dev/ttyE0 0600 /dev/console:/dev/wskbd0:/dev/wsmouse0 +/dev/ttyC0 0600 /dev/console:/dev/wskbd0:/dev/wsmouse0 diff --git a/etc/etc.powerpc/ttys b/etc/etc.powerpc/ttys index df8e72e7d30..463c6b6a727 100644 --- a/etc/etc.powerpc/ttys +++ b/etc/etc.powerpc/ttys @@ -1,5 +1,5 @@ # -# $OpenBSD: ttys,v 1.10 2000/09/06 02:54:26 rahnds Exp $ +# $OpenBSD: ttys,v 1.11 2001/01/30 08:34:09 deraadt Exp $ # # name getty type status comments # @@ -9,4 +9,4 @@ tty01 "/usr/libexec/getty std.9600" unknown off secure tty02 "/usr/libexec/getty std.9600" unknown off secure tty03 "/usr/libexec/getty std.9600" unknown off secure ttyo0 "/usr/libexec/getty std.9600" vt220 off secure -ttyE0 "/usr/libexec/getty std.9600" vt100 on secure +ttyC0 "/usr/libexec/getty std.9600" vt100 on secure |