diff options
| author | Todd C. Miller <millert@cvs.openbsd.org> | 2009-05-01 18:08:44 +0000 |
|---|---|---|
| committer | Todd C. Miller <millert@cvs.openbsd.org> | 2009-05-01 18:08:44 +0000 |
| commit | b40f1addf4460a692f6fa0e2e83000ef6c624a97 (patch) | |
| tree | c0abd3ebd0c489739201071d2b5594879a432e0e | |
| parent | 568ea7db9578ee48e918db6dbef2d19eabd17e29 (diff) | |
Only have tset prompt for the terminal type if it is "unknown" or
not listed in /etc/ttys. OK deraadt@ guenther@
| -rw-r--r-- | etc/root/dot.login | 18 | ||||
| -rw-r--r-- | etc/root/dot.profile | 6 |
2 files changed, 12 insertions, 12 deletions
diff --git a/etc/root/dot.login b/etc/root/dot.login index f4fac29823e..e35a02bd3da 100644 --- a/etc/root/dot.login +++ b/etc/root/dot.login @@ -1,15 +1,15 @@ -# $OpenBSD: dot.login,v 1.11 2005/03/30 19:50:07 deraadt Exp $ +# $OpenBSD: dot.login,v 1.12 2009/05/01 18:08:42 millert Exp $ # # csh login file -set tterm='?'$TERM -set noglob -onintr finish -eval `tset -s -Q $tterm` -finish: -unset noglob -unset tterm -onintr +if ( -x /usr/bin/tset ) then + set noglob histchars="" + onintr finish + eval `tset -sQ '-munknown:?vt220' $TERM` + finish: + unset noglob histchars + onintr +endif if ( `logname` == `whoami` ) then echo "Read the afterboot(8) man page for administration advice." diff --git a/etc/root/dot.profile b/etc/root/dot.profile index d45224f86ae..a57b1f13407 100644 --- a/etc/root/dot.profile +++ b/etc/root/dot.profile @@ -1,4 +1,4 @@ -# $OpenBSD: dot.profile,v 1.6 2009/04/27 05:02:12 deraadt Exp $ +# $OpenBSD: dot.profile,v 1.7 2009/05/01 18:08:43 millert Exp $ # # sh/ksh initialization @@ -8,6 +8,6 @@ export PATH export HOME umask 022 -if [ x"$TERM" != xxterm -a -x /usr/bin/tset ]; then - eval `/usr/bin/tset -sQ \?$TERM` +if [ -x /usr/bin/tset ]; then + eval `/usr/bin/tset -sQ '-munknown:?vt220' $TERM` fi |