console device becomes ttyC0 (ttyC0-9 for pcvt) to avoid pty conflict

4 files changed, 31 insertions, 31 deletions

diff --git a/etc/etc.arc/MAKEDEV b/etc/etc.arc/MAKEDEV
index 20804033413..6664b2e5e05 100644
--- a/etc/etc.arc/MAKEDEV
+++ b/etc/etc.arc/MAKEDEV
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$OpenBSD: MAKEDEV,v 1.1 1996/07/30 20:42:43 pefo Exp $
+#	$OpenBSD: MAKEDEV,v 1.2 1996/08/09 00:25:01 deraadt Exp $
 #	@(#)MAKEDEV	8.1 (Berkeley) 6/9/93
 #
 
@@ -20,7 +20,7 @@
 #	ccd*	contatenated disk devices
 #
 # Console ports:
-#	ttyv0	pccons
+#	ttyC0	pccons
 #
 # Pointing devices:
 #	pms*	PS/2 compatible mouse
@@ -53,7 +53,7 @@ case $i in
 
 all)        
         sh MAKEDEV std fd fd0 sd0 sd1 sd2 st0 cd0 tty0 tty1 pty0 pty1
-        sh MAKEDEV ttyv0 lpt0 pms0 rnd local
+        sh MAKEDEV ttyC0 lpt0 pms0 rnd local
         ;;
 
 std)
@@ -70,15 +70,15 @@ std)
 	mknod stderr		c 7 2	; chmod 666 stderr
 	;;
 
-ttyv*)
-	unit=`expr $i : 'ttyv\(.*\)'`
-	rm -f ttyv$unit
-	mknod ttyv$unit c 14 $unit
-	chown root.wheel ttyv$unit
+ttyC*)
+	unit=`expr $i : 'ttyC\(.*\)'`
+	rm -f ttyC$unit
+	mknod ttyC$unit c 14 $unit
+	chown root.wheel ttyC$unit
 	case $unit in
 	0)
 		rm -f pccons
-		ln -s ttyv0 pccons
+		ln -s ttyC0 pccons
 		;;
 	esac
 	;;
diff --git a/etc/etc.arc/ttys b/etc/etc.arc/ttys
index 74905376cb8..4dd8b06000e 100644
--- a/etc/etc.arc/ttys
+++ b/etc/etc.arc/ttys
@@ -1,11 +1,11 @@
 #
 #       from: @(#)ttys  5.1 (Berkeley) 4/17/89
-#       $Id: ttys,v 1.1 1996/07/30 20:42:43 pefo Exp $
+#       $Id: ttys,v 1.2 1996/08/09 00:25:02 deraadt Exp $
 #
 # name	getty				type	status		comments
 #
 console	"/usr/libexec/getty Pc"		pc3	off secure
-ttyv0	"/usr/libexec/getty Pc"		pc3	on secure
+ttyC0	"/usr/libexec/getty Pc"		pc3	on secure
 tty00	"/usr/libexec/getty std.9600"	unknown	off secure
 tty01	"/usr/libexec/getty std.9600"	unknown	off secure
 tty02	"/usr/libexec/getty std.9600"	unknown	off secure
diff --git a/etc/etc.i386/MAKEDEV b/etc/etc.i386/MAKEDEV
index 2e0f26e030f..c2ac7d810ab 100644
--- a/etc/etc.i386/MAKEDEV
+++ b/etc/etc.i386/MAKEDEV
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$OpenBSD: MAKEDEV,v 1.16 1996/08/08 18:47:15 dm Exp $
+#	$OpenBSD: MAKEDEV,v 1.17 1996/08/09 00:25:03 deraadt Exp $
 #	$NetBSD: MAKEDEV,v 1.40 1996/03/31 00:50:47 perry Exp $
 #
 # Copyright (c) 1990 The Regents of the University of California.
@@ -47,8 +47,8 @@
 #	ccd*	contatenated disk devices
 #
 # Console ports:
-#	ttyv0	pccons or pcvt screen 0
-#	ttyv*	pcvt
+#	ttyC0	pccons or pcvt screen 0
+#	ttyC*	pcvt
 #
 # Pointing devices:
 #	mms*	Microsoft bus mouse
@@ -93,7 +93,7 @@ all)
 	sh MAKEDEV std fd wt0 fd0 fd1 wd0 wd1 wd2 wd3 sd0 sd1 sd2
 	sh MAKEDEV tty0 tty1 tty2 tty3 pty0 pty1 st0 st1 ch0 cd0 cd1
 	sh MAKEDEV mcd0 acd0 vnd0 vnd1 lpa0 lpa1 ccd0 ccd1 ccd2 ccd3
-	sh MAKEDEV lpt0 lpt1 lpt2 ttyv0 bpf0 bpf1 bpf2 bpf3 ipl tun0 tun1 tun2
+	sh MAKEDEV lpt0 lpt1 lpt2 ttyC0 bpf0 bpf1 bpf2 bpf3 ipl tun0 tun1 tun2
 	sh MAKEDEV speaker lkm mms0 lms0 pms0 audio joy0 joy1 apm pcmcia local
 	sh MAKEDEV rnd uk0 uk1 pctr
 # MISSING:
@@ -102,7 +102,7 @@ all)
 
 floppy)
 	sh MAKEDEV std wt0 fd0 fd1 wd0 wd1 sd0 sd1 sd2 tty0 tty1
-	sh MAKEDEV st0 st1 cd0 cd1 mcd0 acd0 ttyv0
+	sh MAKEDEV st0 st1 cd0 cd1 mcd0 acd0 ttyC0
 	;;
 
 std)
@@ -121,15 +121,15 @@ std)
 	mknod stderr		c 22 2	; chmod 666 stderr
 	;;
 
-ttyv*)
-	unit=`expr $i : 'ttyv\(.*\)'`
-	rm -f ttyv$unit
-	mknod ttyv$unit c 12 $unit
-	chown root.wheel ttyv$unit
+ttyC*)
+	unit=`expr $i : 'ttyC\(.*\)'`
+	rm -f ttyC$unit
+	mknod ttyC$unit c 12 $unit
+	chown root.wheel ttyC$unit
 	case $unit in
 	0)
 		rm -f vga
-		ln -s ttyv0 vga
+		ln -s ttyC0 vga
 		;;
 	esac
 	;;
diff --git a/etc/etc.i386/ttys b/etc/etc.i386/ttys
index b3dd681140d..ffa78043c8b 100644
--- a/etc/etc.i386/ttys
+++ b/etc/etc.i386/ttys
@@ -1,18 +1,18 @@
 #
 #	from: @(#)ttys	5.1 (Berkeley) 4/17/89
-#	$Id: ttys,v 1.3 1996/07/28 09:00:57 deraadt Exp $
+#	$Id: ttys,v 1.4 1996/08/09 00:25:03 deraadt Exp $
 #
 # name	getty				type	status		comments
 #
 console	"/usr/libexec/getty Pc"		pc3	off secure
-ttyv0	"/usr/libexec/getty Pc"		pc3	on secure
-ttyv1	"/usr/libexec/getty Pc"		vt220	on secure
-ttyv2	"/usr/libexec/getty Pc"		vt220	on secure
-ttyv3	"/usr/libexec/getty Pc"		vt220	off secure
-ttyv4	"/usr/libexec/getty Pc"		vt220	off secure
-ttyv5	"/usr/libexec/getty Pc"		vt220	off secure
-ttyv6	"/usr/libexec/getty Pc"		vt220	off secure
-ttyv7	"/usr/libexec/getty Pc"		vt220	off secure
+ttyC0	"/usr/libexec/getty Pc"		pc3	on secure
+ttyC1	"/usr/libexec/getty Pc"		vt220	on secure
+ttyC2	"/usr/libexec/getty Pc"		vt220	on secure
+ttyC3	"/usr/libexec/getty Pc"		vt220	off secure
+ttyC4	"/usr/libexec/getty Pc"		vt220	off secure
+ttyC5	"/usr/libexec/getty Pc"		vt220	off secure
+ttyC6	"/usr/libexec/getty Pc"		vt220	off secure
+ttyC7	"/usr/libexec/getty Pc"		vt220	off secure
 tty00	"/usr/libexec/getty std.9600"	unknown on secure
 tty01	"/usr/libexec/getty std.9600"	unknown off
 tty02	"/usr/libexec/getty std.9600"	unknown off