aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWarner Losh <imp@FreeBSD.org>2021-05-04 19:49:27 +0000
committerWarner Losh <imp@FreeBSD.org>2021-05-04 20:06:31 +0000
commit36be84b96699310e0020e194f81fe8e4a6c3f787 (patch)
tree4fb49a4c73878b7a01b9e6e30d4090b61ff08220
parentb621fbb1bf1b2a1e6ea22e0ad2d7667b1aec9fae (diff)
downloadsrc-36be84b96699310e0020e194f81fe8e4a6c3f787.tar.gz
src-36be84b96699310e0020e194f81fe8e4a6c3f787.zip
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
-rw-r--r--sbin/init/ttys.aarch648
-rw-r--r--sbin/init/ttys.arm8
-rw-r--r--sbin/init/ttys.riscv10
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