summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormiod <miod@openbsd.org>2002-11-05 00:42:16 +0000
committermiod <miod@openbsd.org>2002-11-05 00:42:16 +0000
commitaf329f277ce0d690dc7df318a0d68e123f6e0768 (patch)
tree2425b323b39de61c4a0dcae9965590efc1e5f849
parentRename cerror to __cerror and curbrk to __curbrk, to avoid namespace (diff)
downloadwireguard-openbsd-af329f277ce0d690dc7df318a0d68e123f6e0768.tar.xz
wireguard-openbsd-af329f277ce0d690dc7df318a0d68e123f6e0768.zip
Allocate by default 6 virtual consoles on alpha, as on i386, rather than
only one. X11 is configured here to start on ttyC5, like on i386 again. This requires alpha-specific changes to the X servers, that went in the tree before 3.2 was released. On tga-compatible boards, there are no virtual consoles available, and these changes will have no effect.
-rw-r--r--etc/etc.alpha/ttys8
-rw-r--r--sys/arch/alpha/conf/GENERIC7
2 files changed, 11 insertions, 4 deletions
diff --git a/etc/etc.alpha/ttys b/etc/etc.alpha/ttys
index 8aa9fa0a3b0..3cafe63817c 100644
--- a/etc/etc.alpha/ttys
+++ b/etc/etc.alpha/ttys
@@ -1,5 +1,5 @@
#
-# $OpenBSD: ttys,v 1.11 2002/04/24 18:56:54 matthieu Exp $
+# $OpenBSD: ttys,v 1.12 2002/11/05 00:42:16 miod Exp $
#
# name getty type status comments
@@ -11,7 +11,11 @@ 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 off 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
ttyB0 "/usr/libexec/getty std.9600" unknown off secure
diff --git a/sys/arch/alpha/conf/GENERIC b/sys/arch/alpha/conf/GENERIC
index f745a267f4f..b06e7dbd3f9 100644
--- a/sys/arch/alpha/conf/GENERIC
+++ b/sys/arch/alpha/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.118 2002/09/26 21:44:37 deraadt Exp $
+# $OpenBSD: GENERIC,v 1.119 2002/11/05 00:42:19 miod Exp $
# $NetBSD: GENERIC,v 1.31 1996/12/03 17:25:29 cgd Exp $
machine alpha
@@ -36,7 +36,10 @@ option TCVERBOSE # recognize "unknown" TC devices
option USBVERBOSE
# Wscons options
-option WSDISPLAY_COMPAT_RAWKBD # can get raw scancodes
+option WSDISPLAY_COMPAT_USL # VT handling
+option WSDISPLAY_COMPAT_RAWKBD # can get raw scancodes
+option WSDISPLAY_DEFAULTSCREENS=6
+option WSDISPLAY_COMPAT_PCVT # emulate some ioctls
option APERTURE # in-kernel aperture driver for XFree86
option USER_PCICONF # user-space PCI configuration