d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Semi-revert this one file out of r257842. The ttys(5) stuff, as we

Browse Source 
discussed on -current, was not supposed to go in but get solved in
a different way -- e.g., init(8) logic).

Discussed on:   -current
This commit is contained in:
Devin Teske 2013-11-08 10:09:34 +00:00
parent bc4a673f89
commit 9e513d3179
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=257843
1 changed files with 0 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
usr.sbin/bsdinstall/scripts/config
View File

@ -27,81 +27,6 @@
#
# $FreeBSD$
#
############################################################ CONFIGURATION
#
# Location of ttys(5)
#
ETC_TTYS=/etc/ttys
############################################################ FUNCTIONS
# ttus_set_type $serterm
#
# Set terminal type of `ttyu*' and entries in ttys(5) to $serterm.
#
ttus_set_type()
{
local serterm="$1" err
#
# Create new temporary file to write our ttys(5) update with new types.
#
local tmpfile="$( mktemp -t "pgm" )"
[ "$tmpfile" ] || return $FAILURE
#
# Fixup permissions and ownership (mktemp(1) creates the temporary file
# with 0600 permissions -- change the permissions and ownership to
# match ttys(5) before we write it out and mv(1) it into place).
#
local mode="$( stat -f '%#Lp' "$ETC_TTYS" 2> /dev/null )"
local owner="$( stat -f '%u:%g' "$ETC_TTYS" 2> /dev/null )"
f_quietly chmod "${mode:-0644}" "$tmpfile"
f_quietly chown "${owner:-root:wheel}" "$tmpfile"
#
# Operate on ttys(5), replacing only the types of `ttyu*' terminals
# with the new type.
#
if ! err=$( awk -v serterm="$serterm" '
BEGIN {
}
{
# "Skip" blank-lines, lines containing only whitespace, and
# lines containing only a comment or whitespace-then-comment.
#
if ( $0 ~ /^[[:space:]]*(#|$)/ ) { print; next }
# "Skip" terminal types other than those supported
#
if ( $1 !~ /^ttyu.*$/ ) { print; next }
# Change the terminal type to the new value and enable it
#
match($0,
/[[:alnum:]\.\+-_]+[[:space:]]+(on|off)([[:space:]]|$).*$/)
if ( ! RSTART ) { print; next }
start = RSTART
left=substr($0, 0, RSTART - 1)
right=substr($0, start)
match(right,
/[[:alnum:]\.\+-_]+[[:space:]]+(on|off)([[:space:]]+|$)/)
right=substr(right, RSTART + RLENGTH)
printf "%s%s on %s\n", left, serterm, right
}
' "$ETC_TTYS" > "$tmpfile" 2>&1 ); then
f_show_err "%s" "$err"
return $FAILURE
fi
if ! err=$( mv -f "$tmpfile" "$ETC_TTYS" 2>&1 ); then
f_show_err "%s" "$err"
return $FAILURE
fi
return $SUCCESS
}
############################################################ MAIN
cat $BSDINSTALL_TMPETC/rc.conf.* >> $BSDINSTALL_TMPETC/rc.conf
@ -117,8 +42,6 @@ cp $BSDINSTALL_TMPBOOT/* $BSDINSTALL_CHROOT/boot
# Set up other things from installed config
chroot $BSDINSTALL_CHROOT /usr/bin/newaliases
kbdcontrol -d || ttus_set_type vt100
################################################################################
# END
################################################################################