Enable all callin ttys if the tty is an available console.

Discussed on:	-arch@ (no objections)
MFC after:	1 week
Sponsored by:	The FreeBSD Foundation

diff --git a/etc/etc.amd64/ttys b/etc/etc.amd64/ttys
index 8268df3e994d0c8955d6b40f7bbf22d2ab78789f..15eb30dc91ecabe0a00bf2794b5ed80302ad8bae 100644 (file)
--- a/etc/etc.amd64/ttys
+++ b/etc/etc.amd64/ttys
@@ -42,8 +42,8 @@ ttyv8 "/usr/local/bin/xdm -nodaemon"  xterm   off secure
 # Serial terminals
 # The 'dialup' keyword identifies dialin lines to login, fingerd etc.
 ttyu0  "/usr/libexec/getty 3wire"      vt100   onifconsole secure
-ttyu1  "/usr/libexec/getty std.9600"   dialup  off secure
-ttyu2  "/usr/libexec/getty std.9600"   dialup  off secure
-ttyu3  "/usr/libexec/getty std.9600"   dialup  off secure
+ttyu1  "/usr/libexec/getty 3wire"      vt100   onifconsole secure
+ttyu2  "/usr/libexec/getty 3wire"      vt100   onifconsole secure
+ttyu3  "/usr/libexec/getty 3wire"      vt100   onifconsole secure
 # Dumb console
 dcons  "/usr/libexec/getty std.9600"   vt100   off secure

diff --git a/etc/etc.i386/ttys b/etc/etc.i386/ttys
index 8268df3e994d0c8955d6b40f7bbf22d2ab78789f..15eb30dc91ecabe0a00bf2794b5ed80302ad8bae 100644 (file)
--- a/etc/etc.i386/ttys
+++ b/etc/etc.i386/ttys
@@ -42,8 +42,8 @@ ttyv8 "/usr/local/bin/xdm -nodaemon"  xterm   off secure
 # Serial terminals
 # The 'dialup' keyword identifies dialin lines to login, fingerd etc.
 ttyu0  "/usr/libexec/getty 3wire"      vt100   onifconsole secure
-ttyu1  "/usr/libexec/getty std.9600"   dialup  off secure
-ttyu2  "/usr/libexec/getty std.9600"   dialup  off secure
-ttyu3  "/usr/libexec/getty std.9600"   dialup  off secure
+ttyu1  "/usr/libexec/getty 3wire"      vt100   onifconsole secure
+ttyu2  "/usr/libexec/getty 3wire"      vt100   onifconsole secure
+ttyu3  "/usr/libexec/getty 3wire"      vt100   onifconsole secure
 # Dumb console
 dcons  "/usr/libexec/getty std.9600"   vt100   off secure

diff --git a/etc/etc.mips/ttys b/etc/etc.mips/ttys
index a07cbc282cdb09673a3c8fb61f58d266e3dbc6d9..21bb9325f3bfc27fde53ce77d788018f0707e004 100644 (file)
--- a/etc/etc.mips/ttys
+++ b/etc/etc.mips/ttys
@@ -30,7 +30,7 @@
 console        none                            unknown off secure
 # Serial terminals
 # The 'dialup' keyword identifies dialin lines to login, fingerd etc.
-ttyu0  "/usr/libexec/getty 3wire"      vt100   on  secure
-ttyu1  "/usr/libexec/getty std.115200" dialup  off secure
-ttyu2  "/usr/libexec/getty std.115200" dialup  off secure
-ttyu3  "/usr/libexec/getty std.115200" dialup  off secure
+ttyu0  "/usr/libexec/getty 3wire"      vt100   onifconsole secure
+ttyu1  "/usr/libexec/getty 3wire"      vt100   onifconsole secure
+ttyu2  "/usr/libexec/getty 3wire"      vt100   onifconsole secure
+ttyu3  "/usr/libexec/getty 3wire"      vt100   onifconsole secure

diff --git a/etc/etc.pc98/ttys b/etc/etc.pc98/ttys
index ad20aca69f9ee0721c2bd13bbe92ddce3b83dc1a..d75cf053ab0d40ca45921e73004f21612e998a30 100644 (file)
--- a/etc/etc.pc98/ttys
+++ b/etc/etc.pc98/ttys
@@ -41,9 +41,9 @@ ttyv7 "/usr/libexec/getty Pc"         cons25w on  secure
 ttyv8  "/usr/local/bin/xdm -nodaemon"  xterm   off secure
 # Serial terminals
 # The 'dialup' keyword identifies dialin lines to login, fingerd etc.
-ttyu0  "/usr/libexec/getty std.9600"   dialup  off secure
-ttyu1  "/usr/libexec/getty std.9600"   dialup  off secure
-ttyu2  "/usr/libexec/getty std.9600"   dialup  off secure
-ttyu3  "/usr/libexec/getty std.9600"   dialup  off secure
+ttyu0  "/usr/libexec/getty 3wire"      vt100   onifconsole secure
+ttyu1  "/usr/libexec/getty 3wire"      vt100   onifconsole secure
+ttyu2  "/usr/libexec/getty 3wire"      vt100   onifconsole secure
+ttyu3  "/usr/libexec/getty 3wire"      vt100   onifconsole secure
 # Dumb console
 dcons  "/usr/libexec/getty std.9600"   vt100   off secure

diff --git a/etc/etc.powerpc/ttys b/etc/etc.powerpc/ttys
index 793a155b635826e509120ab5545b6a96121243b2..606e963e633545d3a8cdd2e15d334a37b2980819 100644 (file)
--- a/etc/etc.powerpc/ttys
+++ b/etc/etc.powerpc/ttys
@@ -41,9 +41,9 @@ ttyv7 "/usr/libexec/getty Pc"         xterm   on  secure
 #ttyv8 "/usr/local/bin/xdm -nodaemon"  xterm   off secure
 # Serial terminals
 # The 'dialup' keyword identifies dialin lines to login, fingerd etc.
-ttyu0  "/usr/libexec/getty 3wire"      vt100   on  secure
-ttyu1  "/usr/libexec/getty std.9600"   dialup  off secure
-ttyu2  "/usr/libexec/getty std.9600"   dialup  off secure
-ttyu3  "/usr/libexec/getty std.9600"   dialup  off secure
+ttyu0  "/usr/libexec/getty 3wire"      vt100   onifconsole secure
+ttyu1  "/usr/libexec/getty 3wire"      vt100   onifconsole secure
+ttyu2  "/usr/libexec/getty 3wire"      vt100   onifconsole secure
+ttyu3  "/usr/libexec/getty 3wire"      vt100   onifconsole secure
 # Dumb console
 dcons  "/usr/libexec/getty std.9600"   vt100   off secure

diff --git a/etc/etc.sparc64/ttys b/etc/etc.sparc64/ttys
index c3fa95f9ad5789fe5bef53a904c055f5cb9fb2df..afca321996fe8b03c71bc6cea49301c46e72623a 100644 (file)
--- a/etc/etc.sparc64/ttys
+++ b/etc/etc.sparc64/ttys
@@ -46,9 +46,9 @@ ttyv8 "/usr/local/bin/xdm -nodaemon"  xterm   off secure
 # Serial terminals
 # The 'dialup' keyword identifies dialin lines to login, fingerd etc.
 # uart(4)
-ttyu0  "/usr/libexec/getty 3wire"      vt100   on  secure
-ttyu1  "/usr/libexec/getty 3wire"      vt100   on  secure
-ttyu2  "/usr/libexec/getty 3wire"      vt100   on  secure
-ttyu3  "/usr/libexec/getty std.9600"   vt100   off secure
+ttyu0  "/usr/libexec/getty 3wire"      vt100   onifconsole secure
+ttyu1  "/usr/libexec/getty 3wire"      vt100   onifconsole secure
+ttyu2  "/usr/libexec/getty 3wire"      vt100   onifconsole secure
+ttyu3  "/usr/libexec/getty 3wire"      vt100   onifconsole secure
 # Dumb console
 dcons  "/usr/libexec/getty std.9600"   vt100   off secure