Use /etc/ttys and /etc/gettytab that ships with the update instead of rewriting the file from a custom script (and loosing special formatting such as tabs)

1 files changed, 0 insertions, 541 deletions

diff --git a/tmp/post_upgrade_command b/tmp/post_upgrade_command
index 694dca4..5c49efc 100755
--- a/tmp/post_upgrade_command
+++ b/tmp/post_upgrade_command
@@ -3,547 +3,6 @@
 touch /var/run/config.lock
 /etc/rc.conf_mount_rw
 
-# Make sure gettytab is correct
-cat <<EOFEOF >/etc/gettytab
-# $FreeBSD: src/etc/gettytab,v 1.22 2004/06/06 11:46:27 schweikh Exp $
-#	from: @(#)gettytab	5.14 (Berkeley) 3/27/91
-#
-# Most of the table entries here are just copies of the old getty table,
-# it is by no means certain, or even likely, that any of them are optimal
-# for any purpose whatever.  Nor is it likely that more than a couple are
-# even correct.
-#
-# The default gettytab entry, used to set defaults for all other
-# entries, and in cases where getty is called with no table name.
-#
-# cb, ce and ck are desirable on most crt's.  The non-crt entries need to
-# be changed to turn them off (:cb@:ce@:ck@:).
-#
-# lc should always be on; it's a remainder of some stone age when there
-# have been terminals around not being able of handling lower-case
-# characters. Those terminals aren't supported any longer, but getty is
-#
-# specify no parity.   The different parities are:
-#     (none): same as ep for getty.  login will use terminal as is.
-#     ep:     getty will use raw mode (cs8 -parenb) (unless rw is set) and
-#             fake parity.  login will use even parity (cs7 parenb -parodd).
-#     op:     same as ep except odd parity (cs7 parenb parodd) for login.
-#             getty will fake odd parity as well.
-#     ap:     same as ep except -inpck instead of inpck for login.
-#             ap overrides op and ep.
-#     np:     1. don't fake parity in getty.  The fake parity garbles
-#                characters on non-terminals (like pccons) that don't
-#                support parity.  It would probably better for getty not to
-#                try to fake parity.  It could just use cbreak mode so as
-#                not to force cs8 and let the hardware handle the parity.
-#                login has to be rely on the hardware anyway.
-#             2. set cs8 -parenb -istrip -inpck.
-#     ep:op:  same as ap.
-#
-default:\
-	::cb:ce:ck:lc:fd#1000:im=\r\n%s/%m (%h) (%t)\r\n\r\n:sp#1200:\
-	:if=/etc/issue:
-
-#
-# Fixed speed entries
-#
-#	The "std.NNN" names are known to the special case
-#	portselector code in getty, however they can
-#	be assigned to any table desired.
-#	The "NNN-baud" names are known to the special case
-#	autobaud code in getty, and likewise can
-#	be assigned to any table desired (hopefully the same speed).
-#
-a|std.110|110-baud:\
-	:np:nd#1:cd#1:uc:sp#110:
-b|std.134|134.5-baud:\
-	:np:nd#1:cd#2:ff#1:td#1:sp#134:ht:nl:
-1|std.150|150-baud:\
-	:np:nd#1:cd#2:td#1:fd#1:sp#150:ht:nl:lm=\E\72\6\6\17login\72 :
-c|std.300|300-baud:\
-	:np:nd#1:cd#1:sp#300:
-d|std.600|600-baud:\
-	:np:nd#1:cd#1:sp#600:
-f|std.1200|1200-baud:\
-	:np:fd#1:sp#1200:
-6|std.2400|2400-baud:\
-	:np:sp#2400:
-7|std.4800|4800-baud:\
-	:np:sp#4800:
-2|std.9600|9600-baud:\
-	:np:sp#9600:
-g|std.19200|19200-baud:\
-	:np:sp#19200:
-std.38400|38400-baud:\
-	:np:sp#38400:
-std.57600|57600-baud:\
-	:np:sp#57600:
-std.115200|115200-baud:\
-	:np:sp#115200:
-std.230400|230400-baud:\
-	:np:sp#230400:
-
-#
-# Entry specifying explicit device settings.  See termios(4) and
-# /usr/include/termios.h, too.  The entry forces the tty into
-# CLOCAL mode (so no DCD is required), and uses Xon/Xoff flow control.
-#
-# cflags: CLOCAL | HUPCL | CREAD | CS8
-# oflags: OPOST | ONLCR | OXTABS
-# iflags: IXOFF | IXON | ICRNL | IGNPAR
-# lflags: IEXTEN | ICANON | ISIG | ECHOCTL | ECHO | ECHOK | ECHOE | ECHOKE
-#
-# (Echoing is done inside getty itself.)
-#
-local.9600|CLOCAL tty @ 9600 Bd:\
-	:c0#0x0000c300:c1#0x0000cb00:c2#0x0000cb00:\
-	:o0#0x00000007:o1#0x00000002:o2#0x00000007:\
-	:i0#0x00000704:i1#0x00000000:i2#0x00000704:\
-	:l0#0x000005cf:l1#0x00000000:l2#0x000005cf:\
-	:sp#9600:
-
-#
-# Dial in rotary tables, speed selection via 'break'
-#
-0|d300|Dial-300:\
-	:nx=d1200:cd#2:sp#300:
-d1200|Dial-1200:\
-	:nx=d150:fd#1:sp#1200:
-d150|Dial-150:\
-	:nx=d110:lm@:tc=150-baud:
-d110|Dial-110:\
-	:nx=d300:tc=300-baud:
-
-#
-# Fast dialup terminals, 2400/1200/300 rotary (can start either way)
-#
-D2400|d2400|Fast-Dial-2400:\
-	:nx=D1200:tc=2400-baud:
-3|D1200|Fast-Dial-1200:\
-	:nx=D300:tc=1200-baud:
-5|D300|Fast-Dial-300:\
-	:nx=D2400:tc=300-baud:
-
-#
-#telebit (19200)
-#
-t19200:\
-	:nx=t2400:tc=19200-baud:
-t2400:\
-	:nx=t1200:tc=2400-baud:
-t1200:\
-	:nx=t19200:tc=1200-baud:
-
-#
-#telebit (9600)
-#
-t9600:\
-	:nx=t2400a:tc=9600-baud:
-t2400a:\
-	:nx=t1200a:tc=2400-baud:
-t1200a:\
-	:nx=t9600:tc=1200-baud:
-
-#
-# Odd special case terminals
-#
--|tty33|asr33|Pity the poor user of this beast:\
-	:tc=110-baud:
-
-4|Console|Console Decwriter II:\
-	:nd@:cd@:rw:tc=300-baud:
-
-e|Console-1200|Console Decwriter III:\
-	:fd@:nd@:cd@:rw:tc=1200-baud:
-
-i|Interdata console:\
-	:uc:sp#0:
-
-l|lsi chess terminal:\
-	:sp#300:
-
-X|Xwindow|X window system:\
-	:fd@:nd@:cd@:rw:sp#9600:
-
-P|Pc|Pc console:\
-	:ht:np:sp#115200:al=root:
-
-bootupcli:\
-	tc=std.9600:\
-	:ht:np:sp#115200:al=root:
-
-#
-# Wierdo special case for fast crt's with hardcopy devices
-#
-8|T9600|CRT with hardcopy:\
-	:nx=T300:tc=9600-baud:
-9|T300|CRT with hardcopy (300):\
-	:nx=T9600:tc=300-baud:
-
-#
-# Plugboard, and misc other terminals
-#
-plug-9600|Plugboard-9600:\
-	:pf#1:tc=9600-baud:
-p|P9600|Plugboard-9600-rotary:\
-	:pf#1:nx=P300:tc=9600-baud:
-q|P300|Plugboard-300:\
-	:pf#1:nx=P1200:tc=300-baud:
-r|P1200|Plugboard-1200:\
-	:pf#1:nx=P9600:tc=1200-baud:
-
-#
-# XXXX Port selector
-#
-s|DSW|Port Selector:\
-	:ps:sp#2400:
-
-#
-# Auto-baud speed detect entry for Micom 600.
-# Special code in getty will switch this out
-# to one of the NNN-baud entries.
-#
-A|Auto-baud:\
-	:ab:sp#2400:f0#040:
-
-#
-# autologin - automatically log in as root
-#
-
-autologin|al.9600:\
-	::tc=std.9600:
-
-#
-# Entries for 3-wire serial terminals.  These don't supply carrier, so
-# clocal needs to be set, and crtscts needs to be unset.
-#
-3wire.9600|9600-3wire:\
-	:np:nc:sp#9600:
-3wire.38400|38400-3wire:\
-	:np:nc:sp#38400:
-3wire.57600|57600-3wire:\
-	:np:nc:sp#57600:
-3wire.115200|115200-3wire:\
-	:np:nc:sp#115200:
-3wire.230400|230400-3wire:\
-	:np:nc:sp#230400:
-
-EOFEOF
-
-# Make sure /etc/ttys is correct
-cat <<EOFEOFA >/etc/ttys
-#
-# $FreeBSD: src/etc/etc.i386/ttys,v 1.10 2003/10/24 15:44:08 simokawa Exp $
-#	@(#)ttys	5.1 (Berkeley) 4/17/89
-#
-# This file specifies various information about terminals on the system.
-# It is used by several different programs.  Common entries for the
-# various columns include:
-#
-# name  The name of the terminal device.
-#
-# getty The program to start running on the terminal.  Typically a
-#       getty program, as the name implies.  Other common entries
-#       include none, when no getty is needed, and xdm, to start the
-#       X Window System.
-#
-# type The initial terminal type for this port.  For hardwired
-#      terminal lines, this will contain the type of terminal used.
-#      For virtual consoles, the correct type is typically cons25, but
-#      vt220 will work better if you need interoperability with other
-#      systems like Solaris or GNU/Linux.
-#      Other common values include network for network connections on
-#      pseudo-terminals, dialup for incoming modem ports, and unknown
-#      when the terminal type cannot be predetermined.
-#
-# status Must be on or off.  If on, init will run the getty program on
-#        the specified port.  If the word "secure" appears, this tty
-#        allows root login.
-#
-# name	getty				type	status		comments
-#
-# If console is marked "insecure", then init will ask for the root password
-# when going to single-user mode.
-console	none				unknown	off secure
-#
-ttyv0	"/usr/libexec/getty Pc"		cons25	on  secure
-# Virtual terminals
-ttyv1	"/usr/libexec/getty Pc"		cons25	off  secure
-ttyv2	"/usr/libexec/getty Pc"		cons25	off  secure
-ttyv3	"/usr/libexec/getty Pc"		cons25	off  secure
-ttyv4	"/usr/libexec/getty Pc"		cons25	off  secure
-ttyv5	"/usr/libexec/getty Pc"		cons25	off  secure
-ttyv6	"/usr/libexec/getty Pc"		cons25	off  secure
-ttyv7	"/usr/libexec/getty Pc"		cons25	off  secure
-ttyv8	"/usr/X11R6/bin/xdm -nodaemon"	xterm	off secure
-# Serial terminals
-# The 'dialup' keyword identifies dialin lines to login, fingerd etc.
-ttyd0	"/usr/libexec/getty bootupcli"	dialup	off secure
-ttyd1	"/usr/libexec/getty std.9600"	dialup	off secure
-ttyd2	"/usr/libexec/getty std.9600"	dialup	off secure
-ttyd3	"/usr/libexec/getty std.9600"	dialup	off secure
-# Dumb console
-dcons	"/usr/libexec/getty std.9600"	vt100	off secure
-# Pseudo terminals
-ttyp0	none			network
-ttyp1	none			network
-ttyp2	none			network
-ttyp3	none			network
-ttyp4	none			network
-ttyp5	none			network
-ttyp6	none			network
-ttyp7	none			network
-ttyp8	none			network
-ttyp9	none			network
-ttypa	none			network
-ttypb	none			network
-ttypc	none			network
-ttypd	none			network
-ttype	none			network
-ttypf	none			network
-ttypg	none			network
-ttyph	none			network
-ttypi	none			network
-ttypj	none			network
-ttypk	none			network
-ttypl	none			network
-ttypm	none			network
-ttypn	none			network
-ttypo	none			network
-ttypp	none			network
-ttypq	none			network
-ttypr	none			network
-ttyps	none			network
-ttypt	none			network
-ttypu	none			network
-ttypv	none			network
-ttyq0	none			network
-ttyq1	none			network
-ttyq2	none			network
-ttyq3	none			network
-ttyq4	none			network
-ttyq5	none			network
-ttyq6	none			network
-ttyq7	none			network
-ttyq8	none			network
-ttyq9	none			network
-ttyqa	none			network
-ttyqb	none			network
-ttyqc	none			network
-ttyqd	none			network
-ttyqe	none			network
-ttyqf	none			network
-ttyqg	none			network
-ttyqh	none			network
-ttyqi	none			network
-ttyqj	none			network
-ttyqk	none			network
-ttyql	none			network
-ttyqm	none			network
-ttyqn	none			network
-ttyqo	none			network
-ttyqp	none			network
-ttyqq	none			network
-ttyqr	none			network
-ttyqs	none			network
-ttyqt	none			network
-ttyqu	none			network
-ttyqv	none			network
-ttyr0	none			network
-ttyr1	none			network
-ttyr2	none			network
-ttyr3	none			network
-ttyr4	none			network
-ttyr5	none			network
-ttyr6	none			network
-ttyr7	none			network
-ttyr8	none			network
-ttyr9	none			network
-ttyra	none			network
-ttyrb	none			network
-ttyrc	none			network
-ttyrd	none			network
-ttyre	none			network
-ttyrf	none			network
-ttyrg	none			network
-ttyrh	none			network
-ttyri	none			network
-ttyrj	none			network
-ttyrk	none			network
-ttyrl	none			network
-ttyrm	none			network
-ttyrn	none			network
-ttyro	none			network
-ttyrp	none			network
-ttyrq	none			network
-ttyrr	none			network
-ttyrs	none			network
-ttyrt	none			network
-ttyru	none			network
-ttyrv	none			network
-ttys0	none			network
-ttys1	none			network
-ttys2	none			network
-ttys3	none			network
-ttys4	none			network
-ttys5	none			network
-ttys6	none			network
-ttys7	none			network
-ttys8	none			network
-ttys9	none			network
-ttysa	none			network
-ttysb	none			network
-ttysc	none			network
-ttysd	none			network
-ttyse	none			network
-ttysf	none			network
-ttysg	none			network
-ttysh	none			network
-ttysi	none			network
-ttysj	none			network
-ttysk	none			network
-ttysl	none			network
-ttysm	none			network
-ttysn	none			network
-ttyso	none			network
-ttysp	none			network
-ttysq	none			network
-ttysr	none			network
-ttyss	none			network
-ttyst	none			network
-ttysu	none			network
-ttysv	none			network
-ttyP0	none			network
-ttyP1	none			network
-ttyP2	none			network
-ttyP3	none			network
-ttyP4	none			network
-ttyP5	none			network
-ttyP6	none			network
-ttyP7	none			network
-ttyP8	none			network
-ttyP9	none			network
-ttyPa	none			network
-ttyPb	none			network
-ttyPc	none			network
-ttyPd	none			network
-ttyPe	none			network
-ttyPf	none			network
-ttyPg	none			network
-ttyPh	none			network
-ttyPi	none			network
-ttyPj	none			network
-ttyPk	none			network
-ttyPl	none			network
-ttyPm	none			network
-ttyPn	none			network
-ttyPo	none			network
-ttyPp	none			network
-ttyPq	none			network
-ttyPr	none			network
-ttyPs	none			network
-ttyPt	none			network
-ttyPu	none			network
-ttyPv	none			network
-ttyQ0	none			network
-ttyQ1	none			network
-ttyQ2	none			network
-ttyQ3	none			network
-ttyQ4	none			network
-ttyQ5	none			network
-ttyQ6	none			network
-ttyQ7	none			network
-ttyQ8	none			network
-ttyQ9	none			network
-ttyQa	none			network
-ttyQb	none			network
-ttyQc	none			network
-ttyQd	none			network
-ttyQe	none			network
-ttyQf	none			network
-ttyQg	none			network
-ttyQh	none			network
-ttyQi	none			network
-ttyQj	none			network
-ttyQk	none			network
-ttyQl	none			network
-ttyQm	none			network
-ttyQn	none			network
-ttyQo	none			network
-ttyQp	none			network
-ttyQq	none			network
-ttyQr	none			network
-ttyQs	none			network
-ttyQt	none			network
-ttyQu	none			network
-ttyQv	none			network
-ttyR0	none			network
-ttyR1	none			network
-ttyR2	none			network
-ttyR3	none			network
-ttyR4	none			network
-ttyR5	none			network
-ttyR6	none			network
-ttyR7	none			network
-ttyR8	none			network
-ttyR9	none			network
-ttyRa	none			network
-ttyRb	none			network
-ttyRc	none			network
-ttyRd	none			network
-ttyRe	none			network
-ttyRf	none			network
-ttyRg	none			network
-ttyRh	none			network
-ttyRi	none			network
-ttyRj	none			network
-ttyRk	none			network
-ttyRl	none			network
-ttyRm	none			network
-ttyRn	none			network
-ttyRo	none			network
-ttyRp	none			network
-ttyRq	none			network
-ttyRr	none			network
-ttyRs	none			network
-ttyRt	none			network
-ttyRu	none			network
-ttyRv	none			network
-ttyS0	none			network
-ttyS1	none			network
-ttyS2	none			network
-ttyS3	none			network
-ttyS4	none			network
-ttyS5	none			network
-ttyS6	none			network
-ttyS7	none			network
-ttyS8	none			network
-ttyS9	none			network
-ttySa	none			network
-ttySb	none			network
-ttySc	none			network
-ttySd	none			network
-ttySe	none			network
-ttySf	none			network
-ttySg	none			network
-ttySh	none			network
-ttySi	none			network
-ttySj	none			network
-ttySk	none			network
-ttySl	none			network
-ttySm	none			network
-ttySn	none			network
-ttySo	none			network
-ttySp	none			network
-ttySq	none			network
-ttySr	none			network
-ttySs	none			network
-ttySt	none			network
-ttySu	none			network
-ttySv	none			network
-
-EOFEOFA
-
 # Now turn on or off serial console as needed
 php -f /tmp/post_upgrade_command.php