Module Name: src
Committed By: roy
Date: Fri Mar 12 14:50:55 UTC 2010
Modified Files:
src/etc/etc.sparc64: ttys
src/sys/arch/sparc64/conf: GENERIC
Log Message:
Change the default console from wsemul_sun/sun-ss5 to wsemul_vt100/wsvt25.
This allows for a colour console, fixes home/end keys not working and
works with the embedded wsvt25 description in libterminfo.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/etc/etc.sparc64/ttys
cvs rdiff -u -r1.120 -r1.121 src/sys/arch/sparc64/conf/GENERIC
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/etc.sparc64/ttys
diff -u src/etc/etc.sparc64/ttys:1.9 src/etc/etc.sparc64/ttys:1.10
--- src/etc/etc.sparc64/ttys:1.9 Tue Oct 7 10:00:02 2008
+++ src/etc/etc.sparc64/ttys Fri Mar 12 14:50:54 2010
@@ -1,15 +1,15 @@
-# $NetBSD: ttys,v 1.9 2008/10/07 10:00:02 abs Exp $
+# $NetBSD: ttys,v 1.10 2010/03/12 14:50:54 roy Exp $
#
# @(#)ttys 5.1 (Berkeley) 4/17/89
#
# name getty type status comments
#
-console "/usr/libexec/getty suncons" sun-ss5 on secure
-constty "/usr/libexec/getty suncons" sun-ss5 off secure
-ttyE0 "/usr/libexec/getty suncons" sun-ss5 off secure
-ttyE1 "/usr/libexec/getty suncons" sun-ss5 off secure
-ttyE2 "/usr/libexec/getty suncons" sun-ss5 off secure
-ttyE3 "/usr/libexec/getty suncons" sun-ss5 off secure
+console "/usr/libexec/getty suncons" wsvt25 on secure
+constty "/usr/libexec/getty suncons" wsvt25 off secure
+ttyE0 "/usr/libexec/getty suncons" wsvt25 off secure
+ttyE1 "/usr/libexec/getty suncons" wsvt25 off secure
+ttyE2 "/usr/libexec/getty suncons" wsvt25 off secure
+ttyE3 "/usr/libexec/getty suncons" wsvt25 off secure
ttya "/usr/libexec/getty std.9600" unknown off secure
ttyb "/usr/libexec/getty std.9600" unknown off secure
ttyh0 "/usr/libexec/getty std.9600" unknown off secure
Index: src/sys/arch/sparc64/conf/GENERIC
diff -u src/sys/arch/sparc64/conf/GENERIC:1.120 src/sys/arch/sparc64/conf/GENERIC:1.121
--- src/sys/arch/sparc64/conf/GENERIC:1.120 Wed Mar 10 03:11:49 2010
+++ src/sys/arch/sparc64/conf/GENERIC Fri Mar 12 14:50:55 2010
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.120 2010/03/10 03:11:49 macallan Exp $
+# $NetBSD: GENERIC,v 1.121 2010/03/12 14:50:55 roy Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.120 $"
+#ident "GENERIC-$Revision: 1.121 $"
maxusers 64
@@ -901,7 +901,8 @@
# various options for wscons - we try to look as much like a standard
# sun console as possible
-options WSEMUL_SUN # sun terminal emulation
+#options WSEMUL_SUN # sun terminal emulation
+options WSEMUL_VT100 # allow us to be wsvt25
options WS_DEFAULT_FG=WSCOL_BLACK
options WS_DEFAULT_BG=WSCOL_LIGHT_WHITE
options WSDISPLAY_COMPAT_USL # VT handling
@@ -945,8 +946,8 @@
pseudo-device wsfont
pseudo-device clockctl # user control of clock subsystem
pseudo-device ksyms # /dev/ksyms
-#pseudo-device pf # PF packet filter
-#pseudo-device pflog # PF log if
+pseudo-device pf # PF packet filter
+pseudo-device pflog # PF log if
pseudo-device fss 4 # file system snapshot device
#pseudo-device bcsp # BlueCore Serial Protocol
#pseudo-device btuart # Bluetooth HCI UART (H4)