git: ad0c23cdcd12 - stable/13 - ttys: diff reduction

[Mitchell Horne]

The branch stable/13 has been updated by mhorne:

URL: https://cgit.FreeBSD.org/src/commit/?id=ad0c23cdcd122f2fb1598cfad7d61aabe062bffa

commit ad0c23cdcd122f2fb1598cfad7d61aabe062bffa
Author:     Warner Losh <imp at FreeBSD.org>
AuthorDate: 2021-05-04 19:49:27 +0000
Commit:     Mitchell Horne <mhorne at FreeBSD.org>
CommitDate: 2021-07-21 16:04:43 +0000

    ttys: diff reduction
    
    Back in the day, we used to have a number of entries that were either
    'on' or 'off' directly, rather than conditionally on 'onifexists'
    etc. Back then, we tried to line up the 'secure' columns by using the
    construct 'on secure' or 'off secure' (one space or two). Now that these
    have all moved to a conditional construct, remove the second space on
    the ttys that still have it. This reduces diffs between the different
    ttys and is no functional change. i386 and amd64 did this a long time
    ago, and those are the only ones that affected external users (who used
    to sed 's/on /off /' the entires as part of the automation).
    
    MFC After:              3 days
    Sponsored by:           Netflix
    
    (cherry picked from commit 36be84b96699310e0020e194f81fe8e4a6c3f787)
---
 sbin/init/ttys.aarch64 |  8 ++++----
 sbin/init/ttys.arm     |  8 ++++----
 sbin/init/ttys.riscv   | 10 +++++-----
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/sbin/init/ttys.aarch64 b/sbin/init/ttys.aarch64
index 7412f97fee0b..8a2376e799a1 100644
--- a/sbin/init/ttys.aarch64
+++ b/sbin/init/ttys.aarch64
@@ -41,9 +41,9 @@ ttyv7	"/usr/libexec/getty Pc"		xterm	onifexists secure
 #ttyv8	"/usr/local/bin/xdm -nodaemon"	xterm	onifexists 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 3wire"	vt100	onifconsole  secure
-ttyu2	"/usr/libexec/getty 3wire"	vt100	onifconsole  secure
-ttyu3	"/usr/libexec/getty 3wire"	vt100	onifconsole  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/sbin/init/ttys.arm b/sbin/init/ttys.arm
index 8bbb4883fbd6..b0722e4522dd 100644
--- a/sbin/init/ttys.arm
+++ b/sbin/init/ttys.arm
@@ -41,9 +41,9 @@ ttyv7	"/usr/libexec/getty Pc"		xterm	onifexists 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	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
+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/sbin/init/ttys.riscv b/sbin/init/ttys.riscv
index f2c91229bed2..4e49b7a83bd8 100644
--- a/sbin/init/ttys.riscv
+++ b/sbin/init/ttys.riscv
@@ -41,11 +41,11 @@ ttyv7	"/usr/libexec/getty Pc"		xterm	onifexists secure
 #ttyv8	"/usr/local/bin/xdm -nodaemon"	xterm	onifexists 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 3wire"	vt100	onifconsole  secure
-ttyu2	"/usr/libexec/getty 3wire"	vt100	onifconsole  secure
-ttyu3	"/usr/libexec/getty 3wire"	vt100	onifconsole  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
 # RISC-V HTIF console
-rcons	"/usr/libexec/getty std.9600"	vt100	onifconsole  secure
+rcons	"/usr/libexec/getty std.9600"	vt100	onifconsole secure