summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiod Vallat <miod@cvs.openbsd.org>2008-01-09 17:39:43 +0000
committerMiod Vallat <miod@cvs.openbsd.org>2008-01-09 17:39:43 +0000
commit8abd24ecfe3247f25b4610cc877dd09bd6fab717 (patch)
tree28273c69ffc845e0dc12c3d2d12214784540227f
parent646c56c7f9c7a7616ef077259178f4f0bb82e0a8 (diff)
Try to make /etc/ttys more consistent accross platforms, which will also
make the installation media's life easier: - stop using ``Pc'' as a getty terminal type, use std.9600 instead. - on platforms with multiple virtual consoles (alpha, amd64, i386, zaurus), console is disabled, various ttyC* are enabled. - on other platforms, console is enabled, all other devices are disabled. This only changes armish, mac68k, sgi. - default terminal for console is unknown on serial-only machines, vt220 on glass-capable machines (questionable, but done for consistency). - minor whitespace changes. - glass console forgotten on a couple platforms (luna88k, sparc64, vax). eyeballed by deraadt@, ok krw@
-rw-r--r--etc/etc.alpha/ttys14
-rw-r--r--etc/etc.amd64/ttys28
-rw-r--r--etc/etc.armish/ttys6
-rw-r--r--etc/etc.aviion/ttys10
-rw-r--r--etc/etc.hp300/ttys3
-rw-r--r--etc/etc.hppa/ttys4
-rw-r--r--etc/etc.hppa64/ttys4
-rw-r--r--etc/etc.i386/ttys28
-rw-r--r--etc/etc.landisk/ttys4
-rw-r--r--etc/etc.luna88k/ttys10
-rw-r--r--etc/etc.mac68k/ttys19
-rw-r--r--etc/etc.mvme68k/ttys20
-rw-r--r--etc/etc.mvme88k/ttys40
-rw-r--r--etc/etc.mvmeppc/ttys8
-rw-r--r--etc/etc.sgi/ttys8
-rw-r--r--etc/etc.sparc64/ttys4
-rw-r--r--etc/etc.vax/ttys12
-rw-r--r--etc/etc.zaurus/ttys8
18 files changed, 109 insertions, 121 deletions
diff --git a/etc/etc.alpha/ttys b/etc/etc.alpha/ttys
index 3cafe63817c..0ed0f98accf 100644
--- a/etc/etc.alpha/ttys
+++ b/etc/etc.alpha/ttys
@@ -1,5 +1,5 @@
#
-# $OpenBSD: ttys,v 1.12 2002/11/05 00:42:16 miod Exp $
+# $OpenBSD: ttys,v 1.13 2008/01/09 17:39:41 miod Exp $
#
# name getty type status comments
@@ -7,14 +7,14 @@
# enabled for the correct 'real' device (e.g. one of the serial ports).
# console pseudo-device
-console "/usr/libexec/getty std.9600" vt220 off secure
+console "/usr/libexec/getty std.9600" vt220 off secure
# Workstation console (framebuffer) ttys
-ttyC0 "/usr/libexec/getty std.9600" vt220 on secure
-ttyC1 "/usr/libexec/getty std.9600" vt220 on secure
-ttyC2 "/usr/libexec/getty std.9600" vt220 on secure
-ttyC3 "/usr/libexec/getty std.9600" vt220 on secure
-ttyC4 "/usr/libexec/getty std.9600" vt220 on secure
+ttyC0 "/usr/libexec/getty std.9600" vt220 on secure
+ttyC1 "/usr/libexec/getty std.9600" vt220 on secure
+ttyC2 "/usr/libexec/getty std.9600" vt220 on secure
+ttyC3 "/usr/libexec/getty std.9600" vt220 on secure
+ttyC4 "/usr/libexec/getty std.9600" vt220 on secure
ttyC5 "/usr/libexec/getty std.9600" vt220 off secure
# DEC 3000 Z8530 ("scc") serial ports
diff --git a/etc/etc.amd64/ttys b/etc/etc.amd64/ttys
index b86882bc598..b1ff07a9050 100644
--- a/etc/etc.amd64/ttys
+++ b/etc/etc.amd64/ttys
@@ -1,21 +1,21 @@
#
-# $OpenBSD: ttys,v 1.1 2004/01/28 02:11:53 mickey Exp $
+# $OpenBSD: ttys,v 1.2 2008/01/09 17:39:42 miod Exp $
#
# name getty type status comments
#
-console "/usr/libexec/getty Pc" vt220 off secure
-ttyC0 "/usr/libexec/getty Pc" vt220 on secure
-ttyC1 "/usr/libexec/getty Pc" vt220 on secure
-ttyC2 "/usr/libexec/getty Pc" vt220 on secure
-ttyC3 "/usr/libexec/getty Pc" vt220 on secure
-ttyC4 "/usr/libexec/getty Pc" vt220 off secure
-ttyC5 "/usr/libexec/getty Pc" vt220 on secure
-ttyC6 "/usr/libexec/getty Pc" vt220 off secure
-ttyC7 "/usr/libexec/getty Pc" vt220 off secure
-ttyC8 "/usr/libexec/getty Pc" vt220 off secure
-ttyC9 "/usr/libexec/getty Pc" vt220 off secure
-ttyCa "/usr/libexec/getty Pc" vt220 off secure
-ttyCb "/usr/libexec/getty Pc" vt220 off secure
+console "/usr/libexec/getty std.9600" vt220 off secure
+ttyC0 "/usr/libexec/getty std.9600" vt220 on secure
+ttyC1 "/usr/libexec/getty std.9600" vt220 on secure
+ttyC2 "/usr/libexec/getty std.9600" vt220 on secure
+ttyC3 "/usr/libexec/getty std.9600" vt220 on secure
+ttyC4 "/usr/libexec/getty std.9600" vt220 off secure
+ttyC5 "/usr/libexec/getty std.9600" vt220 on secure
+ttyC6 "/usr/libexec/getty std.9600" vt220 off secure
+ttyC7 "/usr/libexec/getty std.9600" vt220 off secure
+ttyC8 "/usr/libexec/getty std.9600" vt220 off secure
+ttyC9 "/usr/libexec/getty std.9600" vt220 off secure
+ttyCa "/usr/libexec/getty std.9600" vt220 off secure
+ttyCb "/usr/libexec/getty std.9600" vt220 off secure
tty00 "/usr/libexec/getty std.9600" unknown off
tty01 "/usr/libexec/getty std.9600" unknown off
tty02 "/usr/libexec/getty std.9600" unknown off
diff --git a/etc/etc.armish/ttys b/etc/etc.armish/ttys
index da3f1c32b03..e9bc3923e00 100644
--- a/etc/etc.armish/ttys
+++ b/etc/etc.armish/ttys
@@ -1,10 +1,10 @@
#
-# $OpenBSD: ttys,v 1.3 2006/06/06 17:47:59 miod Exp $
+# $OpenBSD: ttys,v 1.4 2008/01/09 17:39:42 miod Exp $
#
# name getty type status comments
#
-console "/usr/libexec/getty Pc" vt220 off secure
-tty00 "/usr/libexec/getty std.115200" unknown on secure
+console "/usr/libexec/getty std.115200" vt220 on secure
+tty00 "/usr/libexec/getty std.115200" unknown off secure
tty01 "/usr/libexec/getty std.9600" unknown off secure
tty02 "/usr/libexec/getty std.9600" unknown off
tty03 "/usr/libexec/getty std.9600" unknown off
diff --git a/etc/etc.aviion/ttys b/etc/etc.aviion/ttys
index 0361af42ed6..d98de75e9ff 100644
--- a/etc/etc.aviion/ttys
+++ b/etc/etc.aviion/ttys
@@ -1,11 +1,9 @@
#
-# $OpenBSD: ttys,v 1.1 2006/05/09 21:17:13 miod Exp $
+# $OpenBSD: ttys,v 1.2 2008/01/09 17:39:42 miod Exp $
#
# name getty type status comments
#
-# If the console is marked insecure, single-user requires
-# the root password.
-console "/usr/libexec/getty Pc" unknown on secure
+console "/usr/libexec/getty std.9600" vt220 on secure
# on-board serial ports (ttyb is the mouse port)
-ttya "/usr/libexec/getty Pc" unknown off secure # console
-ttyc "/usr/libexec/getty Pc" unknown off
+ttya "/usr/libexec/getty std.9600" unknown off secure # console
+ttyc "/usr/libexec/getty std.9600" unknown off
diff --git a/etc/etc.hp300/ttys b/etc/etc.hp300/ttys
index 356f59b9349..06b7746f8c4 100644
--- a/etc/etc.hp300/ttys
+++ b/etc/etc.hp300/ttys
@@ -1,9 +1,8 @@
#
-# $OpenBSD: ttys,v 1.7 2005/01/14 22:39:15 miod Exp $
+# $OpenBSD: ttys,v 1.8 2008/01/09 17:39:42 miod Exp $
#
# name getty type status comments
#
-# main console device
console "/usr/libexec/getty std.9600" vt220 on secure
# graphics console
ttyC0 "/usr/libexec/getty std.9600" vt220 off secure
diff --git a/etc/etc.hppa/ttys b/etc/etc.hppa/ttys
index 54a2a1a03b0..63c50f73b46 100644
--- a/etc/etc.hppa/ttys
+++ b/etc/etc.hppa/ttys
@@ -1,11 +1,11 @@
#
-# $OpenBSD: ttys,v 1.4 2003/08/19 02:50:13 mickey Exp $
+# $OpenBSD: ttys,v 1.5 2008/01/09 17:39:42 miod Exp $
#
# name getty type status comments
#
# If the console is marked insecure, single-user requires
# the root password.
-console "/usr/libexec/getty Pc" vt220 on secure
+console "/usr/libexec/getty std.9600" vt220 on secure
ttyC0 "/usr/libexec/getty std.9600" vt220 off secure
ttyD0 "/usr/libexec/getty std.9600" vt220 off secure
tty00 "/usr/libexec/getty std.9600" unknown off secure
diff --git a/etc/etc.hppa64/ttys b/etc/etc.hppa64/ttys
index 3a305765833..fff3252cc5d 100644
--- a/etc/etc.hppa64/ttys
+++ b/etc/etc.hppa64/ttys
@@ -1,11 +1,11 @@
#
-# $OpenBSD: ttys,v 1.1 2005/04/01 16:02:16 deraadt Exp $
+# $OpenBSD: ttys,v 1.2 2008/01/09 17:39:42 miod Exp $
#
# name getty type status comments
#
# If the console is marked insecure, single-user requires
# the root password.
-console "/usr/libexec/getty Pc" vt220 on secure
+console "/usr/libexec/getty std.9600" vt220 on secure
ttyC0 "/usr/libexec/getty std.9600" vt220 off secure
ttyD0 "/usr/libexec/getty std.9600" vt220 off secure
tty00 "/usr/libexec/getty std.9600" unknown off secure
diff --git a/etc/etc.i386/ttys b/etc/etc.i386/ttys
index 6e150fd7019..1f9000668ee 100644
--- a/etc/etc.i386/ttys
+++ b/etc/etc.i386/ttys
@@ -1,21 +1,21 @@
#
-# $OpenBSD: ttys,v 1.17 2002/06/09 06:15:14 todd Exp $
+# $OpenBSD: ttys,v 1.18 2008/01/09 17:39:42 miod Exp $
#
# name getty type status comments
#
-console "/usr/libexec/getty Pc" vt220 off secure
-ttyC0 "/usr/libexec/getty Pc" vt220 on secure
-ttyC1 "/usr/libexec/getty Pc" vt220 on secure
-ttyC2 "/usr/libexec/getty Pc" vt220 on secure
-ttyC3 "/usr/libexec/getty Pc" vt220 on secure
-ttyC4 "/usr/libexec/getty Pc" vt220 off secure
-ttyC5 "/usr/libexec/getty Pc" vt220 on secure
-ttyC6 "/usr/libexec/getty Pc" vt220 off secure
-ttyC7 "/usr/libexec/getty Pc" vt220 off secure
-ttyC8 "/usr/libexec/getty Pc" vt220 off secure
-ttyC9 "/usr/libexec/getty Pc" vt220 off secure
-ttyCa "/usr/libexec/getty Pc" vt220 off secure
-ttyCb "/usr/libexec/getty Pc" vt220 off secure
+console "/usr/libexec/getty std.9600" vt220 off secure
+ttyC0 "/usr/libexec/getty std.9600" vt220 on secure
+ttyC1 "/usr/libexec/getty std.9600" vt220 on secure
+ttyC2 "/usr/libexec/getty std.9600" vt220 on secure
+ttyC3 "/usr/libexec/getty std.9600" vt220 on secure
+ttyC4 "/usr/libexec/getty std.9600" vt220 off secure
+ttyC5 "/usr/libexec/getty std.9600" vt220 on secure
+ttyC6 "/usr/libexec/getty std.9600" vt220 off secure
+ttyC7 "/usr/libexec/getty std.9600" vt220 off secure
+ttyC8 "/usr/libexec/getty std.9600" vt220 off secure
+ttyC9 "/usr/libexec/getty std.9600" vt220 off secure
+ttyCa "/usr/libexec/getty std.9600" vt220 off secure
+ttyCb "/usr/libexec/getty std.9600" vt220 off secure
tty00 "/usr/libexec/getty std.9600" unknown off
tty01 "/usr/libexec/getty std.9600" unknown off
tty02 "/usr/libexec/getty std.9600" unknown off
diff --git a/etc/etc.landisk/ttys b/etc/etc.landisk/ttys
index 710fb756d64..7e9e74e6eff 100644
--- a/etc/etc.landisk/ttys
+++ b/etc/etc.landisk/ttys
@@ -1,7 +1,7 @@
#
-# $OpenBSD: ttys,v 1.2 2006/12/15 18:59:50 miod Exp $
+# $OpenBSD: ttys,v 1.3 2008/01/09 17:39:42 miod Exp $
#
# name getty type status comments
#
-console "/usr/libexec/getty Pc" vt220 on secure
+console "/usr/libexec/getty std.9600" unknown on secure
ttya "/usr/libexec/getty std.9600" unknown off secure
diff --git a/etc/etc.luna88k/ttys b/etc/etc.luna88k/ttys
index 4be282e678b..1c4fc705313 100644
--- a/etc/etc.luna88k/ttys
+++ b/etc/etc.luna88k/ttys
@@ -1,10 +1,10 @@
#
-# $OpenBSD: ttys,v 1.1 2004/04/21 18:23:44 miod Exp $
+# $OpenBSD: ttys,v 1.2 2008/01/09 17:39:42 miod Exp $
#
# name getty type status comments
#
-# If the console is marked insecure, single-user requires
-# the root password.
-console "/usr/libexec/getty Pc" unknown on secure
+console "/usr/libexec/getty std.9600" vt220 on secure
+# graphics console
+ttyC0 "/usr/libexec/getty std.9600" vt220 off secure
# siotty(4) serial console port
-ttya "/usr/libexec/getty Pc" unknown off secure # console
+ttya "/usr/libexec/getty std.9600" unknown off secure # console
diff --git a/etc/etc.mac68k/ttys b/etc/etc.mac68k/ttys
index 7d6f32c396c..cc2de7beea2 100644
--- a/etc/etc.mac68k/ttys
+++ b/etc/etc.mac68k/ttys
@@ -1,20 +1,11 @@
#
-# $OpenBSD: ttys,v 1.9 2006/03/09 20:49:01 miod Exp $
+# $OpenBSD: ttys,v 1.10 2008/01/09 17:39:42 miod Exp $
#
# name getty type status comments
#
-# If the console is marked insecure, single-user requires
-# the root password.
-console "/usr/libexec/getty Pc" vt220 off secure
-#console "/usr/libexec/getty std.9600" vt220 on secure
-
-# Define the console that we actually run getty on.
-# To enable the serial console, mark ttyC0 'off' and turn on the
-# console entry configuring it as though it were one of the serial
-# ports (e.g., setting the entry to 'std.9600').
-ttyC0 "/usr/libexec/getty Pc" vt220 on secure
-
-# Hardwired lines are marked off, by default, so getty(8)
-# is quiet when they don't exist.
+console "/usr/libexec/getty std.9600" vt220 on secure
+# graphics console
+ttyC0 "/usr/libexec/getty std.9600" vt220 off secure
+# serial lines
tty00 "/usr/libexec/getty std.9600" unknown off secure
tty01 "/usr/libexec/getty std.9600" unknown off secure
diff --git a/etc/etc.mvme68k/ttys b/etc/etc.mvme68k/ttys
index 9ee6a8ef4d8..45a6d3d5ff0 100644
--- a/etc/etc.mvme68k/ttys
+++ b/etc/etc.mvme68k/ttys
@@ -1,16 +1,16 @@
#
-# $OpenBSD: ttys,v 1.7 2002/05/30 06:46:13 deraadt Exp $
+# $OpenBSD: ttys,v 1.8 2008/01/09 17:39:42 miod Exp $
#
# name getty type status comments
#
# If the console is marked insecure, single-user requires
# the root password.
-console "/usr/libexec/getty Pc" unknown on secure
-ttya "/usr/libexec/getty Pc" unknown off secure # 147/162 console
-ttyb "/usr/libexec/getty Pc" unknown off
-ttyc "/usr/libexec/getty Pc" unknown off
-ttyd "/usr/libexec/getty Pc" unknown off
-tty00 "/usr/libexec/getty Pc" unknown off secure # 167/17x console
-tty01 "/usr/libexec/getty Pc" unknown off
-tty02 "/usr/libexec/getty Pc" unknown off
-tty03 "/usr/libexec/getty Pc" unknown off
+console "/usr/libexec/getty std.9600" unknown on secure
+ttya "/usr/libexec/getty std.9600" unknown off secure # 147/162 console
+ttyb "/usr/libexec/getty std.9600" unknown off
+ttyc "/usr/libexec/getty std.9600" unknown off
+ttyd "/usr/libexec/getty std.9600" unknown off
+tty00 "/usr/libexec/getty std.9600" unknown off secure # 167/17x console
+tty01 "/usr/libexec/getty std.9600" unknown off
+tty02 "/usr/libexec/getty std.9600" unknown off
+tty03 "/usr/libexec/getty std.9600" unknown off
diff --git a/etc/etc.mvme88k/ttys b/etc/etc.mvme88k/ttys
index 5b8890f5fb2..518fe7c141a 100644
--- a/etc/etc.mvme88k/ttys
+++ b/etc/etc.mvme88k/ttys
@@ -1,30 +1,30 @@
#
-# $OpenBSD: ttys,v 1.8 2004/01/05 20:11:56 miod Exp $
+# $OpenBSD: ttys,v 1.9 2008/01/09 17:39:42 miod Exp $
#
# name getty type status comments
#
# If the console is marked insecure, single-user requires
# the root password.
-console "/usr/libexec/getty Pc" unknown on secure
+console "/usr/libexec/getty std.9600" unknown on secure
# MVME188 dart(4) serial ports
-ttya "/usr/libexec/getty Pc" unknown off secure # console
-ttyb "/usr/libexec/getty Pc" unknown off
+ttya "/usr/libexec/getty std.9600" unknown off secure # console
+ttyb "/usr/libexec/getty std.9600" unknown off
# MVME1x7 cl(4) serial ports
-tty00 "/usr/libexec/getty Pc" unknown off secure # console
-tty01 "/usr/libexec/getty Pc" unknown off
-tty02 "/usr/libexec/getty Pc" unknown off
-tty03 "/usr/libexec/getty Pc" unknown off
+tty00 "/usr/libexec/getty std.9600" unknown off secure # console
+tty01 "/usr/libexec/getty std.9600" unknown off
+tty02 "/usr/libexec/getty std.9600" unknown off
+tty03 "/usr/libexec/getty std.9600" unknown off
# M8120 remaining cl(4) serial ports
-tty04 "/usr/libexec/getty Pc" unknown off
-tty05 "/usr/libexec/getty Pc" unknown off
-tty06 "/usr/libexec/getty Pc" unknown off
-tty07 "/usr/libexec/getty Pc" unknown off
+tty04 "/usr/libexec/getty std.9600" unknown off
+tty05 "/usr/libexec/getty std.9600" unknown off
+tty06 "/usr/libexec/getty std.9600" unknown off
+tty07 "/usr/libexec/getty std.9600" unknown off
# MVME332 vx(4) serial ports
-ttyv0 "/usr/libexec/getty Pc" unknown off
-ttyv1 "/usr/libexec/getty Pc" unknown off
-ttyv2 "/usr/libexec/getty Pc" unknown off
-ttyv3 "/usr/libexec/getty Pc" unknown off
-ttyv4 "/usr/libexec/getty Pc" unknown off
-ttyv5 "/usr/libexec/getty Pc" unknown off
-ttyv6 "/usr/libexec/getty Pc" unknown off
-ttyv7 "/usr/libexec/getty Pc" unknown off
+ttyv0 "/usr/libexec/getty std.9600" unknown off
+ttyv1 "/usr/libexec/getty std.9600" unknown off
+ttyv2 "/usr/libexec/getty std.9600" unknown off
+ttyv3 "/usr/libexec/getty std.9600" unknown off
+ttyv4 "/usr/libexec/getty std.9600" unknown off
+ttyv5 "/usr/libexec/getty std.9600" unknown off
+ttyv6 "/usr/libexec/getty std.9600" unknown off
+ttyv7 "/usr/libexec/getty std.9600" unknown off
diff --git a/etc/etc.mvmeppc/ttys b/etc/etc.mvmeppc/ttys
index 41598f08bc4..ab4415bb576 100644
--- a/etc/etc.mvmeppc/ttys
+++ b/etc/etc.mvmeppc/ttys
@@ -1,11 +1,11 @@
#
-# $OpenBSD: ttys,v 1.2 2002/06/09 06:15:14 todd Exp $
+# $OpenBSD: ttys,v 1.3 2008/01/09 17:39:42 miod Exp $
#
# name getty type status comments
#
-console "/usr/libexec/getty std.9600" unknown off secure
-tty00 "/usr/libexec/getty std.9600" unknown on secure
+console "/usr/libexec/getty std.9600" unknown on secure
+tty00 "/usr/libexec/getty std.9600" unknown off secure
tty01 "/usr/libexec/getty std.9600" unknown off
tty02 "/usr/libexec/getty std.9600" unknown off
tty03 "/usr/libexec/getty std.9600" unknown off
-ttyC0 "/usr/libexec/getty std.9600" vt220 on secure
+ttyC0 "/usr/libexec/getty std.9600" vt220 off secure
diff --git a/etc/etc.sgi/ttys b/etc/etc.sgi/ttys
index ec6c2fe8c22..92d633f8277 100644
--- a/etc/etc.sgi/ttys
+++ b/etc/etc.sgi/ttys
@@ -1,11 +1,11 @@
#
-# $OpenBSD: ttys,v 1.2 2007/12/14 16:16:28 jsing Exp $
+# $OpenBSD: ttys,v 1.3 2008/01/09 17:39:42 miod Exp $
#
# name getty type status comments
#
-console "/usr/libexec/getty std.9600" unknown off secure
-ttyC0 "/usr/libexec/getty Pc" vt220 on secure
-tty00 "/usr/libexec/getty std.9600" unknown on secure
+console "/usr/libexec/getty std.9600" vt220 on secure
+ttyC0 "/usr/libexec/getty std.9600" vt220 off 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
tty03 "/usr/libexec/getty std.9600" unknown off secure
diff --git a/etc/etc.sparc64/ttys b/etc/etc.sparc64/ttys
index 87b32386208..e18328abb6c 100644
--- a/etc/etc.sparc64/ttys
+++ b/etc/etc.sparc64/ttys
@@ -1,9 +1,11 @@
#
-# $OpenBSD: ttys,v 1.6 2008/01/08 05:08:12 deraadt Exp $
+# $OpenBSD: ttys,v 1.7 2008/01/09 17:39:42 miod Exp $
#
# name getty type status comments
#
console "/usr/libexec/getty std.9600" sun on secure
+# graphics console
+ttyC0 "/usr/libexec/getty std.9600" sun off secure
# zs(4)-based
ttya "/usr/libexec/getty std.9600" unknown off secure
ttyb "/usr/libexec/getty std.9600" unknown off secure
diff --git a/etc/etc.vax/ttys b/etc/etc.vax/ttys
index b266d95afc9..127fffeecf4 100644
--- a/etc/etc.vax/ttys
+++ b/etc/etc.vax/ttys
@@ -1,14 +1,12 @@
#
-# $OpenBSD: ttys,v 1.5 2002/06/09 06:15:15 todd Exp $
+# $OpenBSD: ttys,v 1.6 2008/01/09 17:39:42 miod Exp $
#
# name getty type status comments
#
-# If the console is marked insecure, single-user requires
-# the root password.
-console "/usr/libexec/getty std.9600" unknown on secure
-
-# Hardwired lines are marked off, by default, so getty(8)
-# is quiet when they don't exist.
+console "/usr/libexec/getty std.9600" vt220 on secure
+# glass console
+ttyC0 "/usr/libexec/getty std.9600" vt220 off secure
+# serial lines
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.zaurus/ttys b/etc/etc.zaurus/ttys
index 4b5c6f3123c..d06bc2026e9 100644
--- a/etc/etc.zaurus/ttys
+++ b/etc/etc.zaurus/ttys
@@ -1,11 +1,11 @@
#
-# $OpenBSD: ttys,v 1.3 2007/03/26 04:10:25 deraadt Exp $
+# $OpenBSD: ttys,v 1.4 2008/01/09 17:39:42 miod Exp $
#
# name getty type status comments
#
-console "/usr/libexec/getty Pc" vt220 off secure
-ttyC0 "/usr/libexec/getty Pc" vt220 on secure
-ttyC1 "/usr/libexec/getty Pc" vt220 off secure
+console "/usr/libexec/getty std.9600" vt220 off secure
+ttyC0 "/usr/libexec/getty std.9600" vt220 on secure
+ttyC1 "/usr/libexec/getty std.9600" vt220 off 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